diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..c68c40b
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190527.docx"
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..c68c40b
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190527.docx"
Binary files differ
diff --git a/~WRL0009.tmp b/~WRL0009.tmp
deleted file mode 100644
index e3653c8..0000000
--- a/~WRL0009.tmp
+++ /dev/null
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..c68c40b
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190527.docx"
Binary files differ
diff --git a/~WRL0009.tmp b/~WRL0009.tmp
deleted file mode 100644
index e3653c8..0000000
--- a/~WRL0009.tmp
+++ /dev/null
Binary files differ
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
deleted file mode 100644
index c307c0b..0000000
--- a/~WRL2471.tmp
+++ /dev/null
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..c68c40b
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190527.docx"
Binary files differ
diff --git a/~WRL0009.tmp b/~WRL0009.tmp
deleted file mode 100644
index e3653c8..0000000
--- a/~WRL0009.tmp
+++ /dev/null
Binary files differ
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
deleted file mode 100644
index c307c0b..0000000
--- a/~WRL2471.tmp
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..833b97a
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx"
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..c68c40b
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190527.docx"
Binary files differ
diff --git a/~WRL0009.tmp b/~WRL0009.tmp
deleted file mode 100644
index e3653c8..0000000
--- a/~WRL0009.tmp
+++ /dev/null
Binary files differ
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
deleted file mode 100644
index c307c0b..0000000
--- a/~WRL2471.tmp
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..833b97a
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190527.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\21620181120.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\21620181120.docx"
deleted file mode 100644
index 70b12e0..0000000
--- "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\21620181120.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ba1d483..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-PgInterface
\ No newline at end of file
diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml
index 11b1eed..22f4898 100644
--- a/.idea/artifacts/PgInterface.xml
+++ b/.idea/artifacts/PgInterface.xml
@@ -74,7 +74,6 @@
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" />
           <element id="library" level="project" name="Maven: stax:stax-api:1.0.1" />
-          <element id="library" level="project" name="Maven: poi-ooxml-schemas:poi-ooxml-schemas:3.8" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.1.10.Final" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" />
           <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 280beb9..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
-
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index b3295c5..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 72213bf..342c1fa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 74c0d0a..b26911b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 691ca64..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3b47332..45e847a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,25 +3,6 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="IdProvider" IDEtalkID="913CFE07E2D14B911AAD826840DC4A30" />
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0fedb3..af04d64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,5 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/PgInterface.iml" filepath="$PROJECT_DIR$/PgInterface.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 3b00020..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f219..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4128e12..5ad35cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,6 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改气体传感器历史返回记录">
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface_war_exploded.xml" afterDir="false" />
@@ -37,115 +38,71 @@
       <change beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/~$说明20181120.docx" beforeDir="false" afterPath="$PROJECT_DIR$/~$说明20181120.docx" afterDir="false" />
+=======
+    <list default="true" id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/~$说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/接口说明20190522.docx" beforeDir="false" />
+>>>>>>> refs/remotes/origin/develop
     </list>
-    <ignored path="PgInterface.iws" />
-    <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/target/" />
-    <ignored path=".idea/dataSources.local.xml" />
-    <ignored path="$PROJECT_DIR$/../out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
   <component name="FUSProjectUsageTrigger">
-    <session id="515841449">
+    <session id="1382581099">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
           <entry key="project.closed" value="18" />
-          <entry key="project.open.time.1" value="2" />
-          <entry key="project.open.time.10" value="1" />
-          <entry key="project.open.time.101" value="1" />
-          <entry key="project.open.time.104" value="1" />
-          <entry key="project.open.time.126" value="1" />
-          <entry key="project.open.time.140" value="1" />
-          <entry key="project.open.time.150" value="1" />
-          <entry key="project.open.time.19" value="2" />
-          <entry key="project.open.time.2" value="4" />
-          <entry key="project.open.time.21" value="1" />
-          <entry key="project.open.time.235" value="1" />
-          <entry key="project.open.time.246" value="1" />
+          <entry key="project.open.time.1" value="5" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.17" value="2" />
+          <entry key="project.open.time.2" value="5" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.23" value="1" />
           <entry key="project.open.time.3" value="2" />
-          <entry key="project.open.time.39" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.46" value="1" />
+          <entry key="project.open.time.4" value="2" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.51" value="1" />
-          <entry key="project.open.time.64" value="1" />
-          <entry key="project.open.time.72" value="1" />
-          <entry key="project.open.time.76" value="1" />
-          <entry key="project.open.time.83" value="1" />
-          <entry key="project.open.time.86" value="1" />
-          <entry key="project.open.time.88" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="31" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.open.time.89" value="1" />
+          <entry key="project.opened" value="23" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="0-SNAPSHOT" value="1" />
-          <entry key="class" value="15" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="607" />
-          <entry key="jsp" value="9" />
-          <entry key="lst" value="3" />
-          <entry key="properties" value="8" />
-          <entry key="xml" value="37" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.vcs.git.usages" />
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="29613" />
-          <entry key="PLAIN_TEXT" value="218" />
-          <entry key="XML" value="111" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.spring.boot.run.usages" />
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="class" value="1" />
-          <entry key="dummy" value="40" />
-          <entry key="iml" value="2" />
-          <entry key="java" value="29613" />
-          <entry key="txt" value="178" />
-          <entry key="xml" value="111" />
+          <entry key="java" value="105" />
+          <entry key="properties" value="2" />
+          <entry key="xml" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="15" />
-          <entry key="IDEA_MODULE" value="2" />
-          <entry key="JAVA" value="607" />
-          <entry key="JSP" value="9" />
-          <entry key="PLAIN_TEXT" value="3" />
-          <entry key="Properties" value="8" />
-          <entry key="UML" value="1" />
-          <entry key="XML" value="37" />
+          <entry key="JAVA" value="105" />
+          <entry key="Properties" value="2" />
+          <entry key="XML" value="4" />
         </counts>
       </usages-collector>
-      <usages-collector id="statistics.spring.boot.mvc.usages" />
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="2457" />
+          <entry key="txt" value="22" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="2457" />
+          <entry key="PLAIN_TEXT" value="22" />
+        </counts>
+      </usages-collector>
     </session>
     <session id="25088207">
       <usages-collector id="statistics.lifecycle.project">
@@ -195,12 +152,10 @@
       </usages-collector>
     </session>
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="PgInterface" />
-  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/spring/taskConfig-applicationContext.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="115">
@@ -235,10 +190,22 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="253">
               <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="247">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+                <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java">
           <provider selected="true" editor-type-id="text-editor" />
@@ -260,44 +227,75 @@
               <caret line="40" selection-start-line="40" selection-end-line="40" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="115">
+              <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+                <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+                <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="529">
               <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="226">
+              <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+              <folding>
+                <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+                <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+                <element signature="e#5758#5774#0" expanded="true" />
+                <element signature="e#5843#5860#0" expanded="true" />
+>>>>>>> refs/remotes/origin/develop
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PgInPgStatusDto.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="46">
               <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-21">
+              <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+              <folding>
+                <element signature="e#1232#1248#0" expanded="true" />
+                <element signature="e#2028#2044#0" expanded="true" />
+                <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+                <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+              </folding>
+>>>>>>> refs/remotes/origin/develop
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Arquillian JUnit Test Class" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
       <find>getConstructionByType</find>
       <find>getConstructionByTimeAndStatus</find>
       <find>resources</find>
@@ -328,24 +326,29 @@
       <find>PropertiesAutoLoad</find>
       <find>convertto</find>
       <find>commons-configuration</find>
+=======
+      <find>getEquipmentDtiList</find>
+      <find>getPgDevice</find>
+      <find>pgDevice</find>
+      <find>getEquipmentStatistic</find>
+      <find>getPgDeviceDtoListByPartition</find>
+      <find>getDeviceByPartition</find>
+      <find>getPgCameraListByPartition</find>
+      <find>getPgConstructionList</find>
+      <find>statisticType</find>
+      <find>reoair</find>
+      <find>downloadFile</find>
+      <find>queryConstructDoc</find>
+>>>>>>> refs/remotes/origin/develop
     </findStrings>
   </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="true" />
-    </FindUsagesManager>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java" />
@@ -353,26 +356,34 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
+>>>>>>> refs/remotes/origin/develop
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/tagMac.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/http/httpURL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/HttpClientUtils.java" />
@@ -397,6 +408,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TaskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/taskRun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java" />
+>>>>>>> refs/remotes/origin/develop
       </list>
     </option>
   </component>
@@ -409,32 +423,17 @@
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
     <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="false" />
-    <option name="FILTER_DEBUG" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="PgInterface" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-          <item name="clean" type="36feed69:MavenProjectsStructure$PluginNode" />
-        </path>
-      </expand>
+      <expand />
       <select />
     </treeState>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-6" />
@@ -460,14 +459,21 @@
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
+=======
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-1366" />
+    <option name="width" value="1366" />
+    <option name="height" value="764" />
+>>>>>>> refs/remotes/origin/develop
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -507,6 +513,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="casic" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -565,6 +572,11 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+=======
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="rs" type="462c0819:PsiDirectoryNode" />
+            </path>
+>>>>>>> refs/remotes/origin/develop
           </expand>
           <select />
         </subPane>
@@ -573,33 +585,9 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/PipeGallery/PgInterface/src/main/java/com/casic/PgInterface/patroler/manager/httpCilent.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1559118973929" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
@@ -637,6 +625,16 @@
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\resources\spring" />
       <recent name="E:\LenovoWS\gitRepository\PG\PgInterface\src\main\java\com\casic\PgInterface\core\util" />
     </key>
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1558941236380" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.38850576" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -650,6 +648,7 @@
       </list>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="RunManager" selected="Application.jsonPathTest">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
@@ -800,6 +799,10 @@
       </method>
     </configuration>
     <configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
+=======
+  <component name="RunManager">
+    <configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="C:\Program Files\Java\jdk1.8.0_131\jre">
+>>>>>>> refs/remotes/origin/develop
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
@@ -810,7 +813,8 @@
         </artifact>
       </deployment>
       <server-settings>
-        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_29" />
+        <option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface" />
+        <option name="JNDI_PORT" value="10993" />
       </server-settings>
       <predefined_log_file id="Tomcat" enabled="true" />
       <predefined_log_file id="Tomcat Catalina" enabled="true" />
@@ -818,9 +822,7 @@
       <predefined_log_file id="Tomcat Host Manager" enabled="false" />
       <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
       <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="30962" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
+        <option name="DEBUG_PORT" value="49590" />
       </RunnerSettings>
       <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
         <option name="USE_ENV_VARIABLES" value="true" />
@@ -868,11 +870,13 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
+        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="PgInterface" />
         </option>
       </method>
     </configuration>
+<<<<<<< HEAD
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
       <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
@@ -980,16 +984,19 @@
   </component>
   <component name="StructureViewFactory">
     <option name="AUTOSCROLL_MODE" value="false" />
+=======
+>>>>>>> refs/remotes/origin/develop
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
-      <created>1510216318970</created>
+      <changelist id="f6a93d46-b9c4-478f-b2fb-fecf60b8f841" name="Default Changelist" comment="" />
+      <created>1545183946622</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
+<<<<<<< HEAD
       <updated>1510216318970</updated>
       <workItem from="1510216323228" duration="257000" />
       <workItem from="1510216708376" duration="537000" />
@@ -1578,137 +1585,110 @@
       <window_info anchor="bottom" id="Android" order="15" />
       <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
       <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="IDEtalk" order="3" />
-      <window_info anchor="right" id="Designer" order="4" />
-      <window_info anchor="right" id="Preview" order="5" weight="0.04845815" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32980332" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.29500756" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout>
-    <layout-to-restore>
-      <window_info active="true" id="Project" order="0" sideWeight="0.91929823" visible="true" weight="0.2246596" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Palette&#9;" order="2" />
-      <window_info id="Build Variants" order="3" side_tool="true" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" sideWeight="0.08070175" side_tool="true" weight="0.3030647" />
-      <window_info id="UI Designer" order="6" />
-      <window_info id="Capture Tool" order="7" />
-      <window_info id="Image Layers" order="8" />
+=======
+      <updated>1545183946622</updated>
+      <workItem from="1545183949180" duration="2619000" />
+      <workItem from="1545205695416" duration="1490000" />
+      <workItem from="1544063186575" duration="1025000" />
+      <workItem from="1545186874438" duration="736000" />
+      <workItem from="1546067978652" duration="1766000" />
+      <workItem from="1546392664757" duration="112000" />
+      <workItem from="1547373629561" duration="98000" />
+      <workItem from="1547429277229" duration="472000" />
+      <workItem from="1548053715382" duration="671000" />
+      <workItem from="1548055401918" duration="406000" />
+      <workItem from="1553073304157" duration="1713000" />
+      <workItem from="1554966573972" duration="82000" />
+      <workItem from="1557452528017" duration="1309000" />
+      <workItem from="1557468719301" duration="1838000" />
+      <workItem from="1557902517014" duration="959000" />
+      <workItem from="1558428045885" duration="2370000" />
+      <workItem from="1558430486624" duration="3564000" />
+      <workItem from="1558486045746" duration="3002000" />
+      <workItem from="1558489504490" duration="9665000" />
+      <workItem from="1558510698861" duration="3177000" />
+      <workItem from="1558936153476" duration="5316000" />
+      <workItem from="1559035171131" duration="3459000" />
+      <workItem from="1559091136123" duration="8236000" />
+    </task>
+    <task id="LOCAL-00001" summary="修改巡检维护查询条件">
+      <created>1558940248477</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1558940248477</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="54085000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1374" y="-8" width="1382" height="784" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20877458" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8174061" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4923077" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
-      <window_info anchor="bottom" id="Changes" order="7" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
-      <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
-      <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.51706487" />
-      <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.43515357" />
-      <window_info anchor="bottom" id="Android" order="15" />
-      <window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
-      <window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Application Servers" order="7" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3246154" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <window_info anchor="bottom" id="Database Changes" order="13" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="14" />
+      <window_info anchor="bottom" id="Statistic" order="15" weight="0.4" />
+>>>>>>> refs/remotes/origin/develop
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="right" id="IDEtalk" order="4" />
-      <window_info anchor="right" id="Designer" order="5" />
-      <window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
-      <window_info anchor="right" id="Bean Validation" order="7" />
-      <window_info anchor="right" id="Palette" order="8" />
-      <window_info anchor="right" id="Maven Projects" order="9" weight="0.19742814" />
-      <window_info anchor="right" id="Capture Analysis" order="10" />
-      <window_info anchor="right" id="Theme Preview" order="11" />
-    </layout-to-restore>
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.32980332" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" />
+    </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增加新旧资产转换接口" />
-    <MESSAGE value="增加时间转换异常处理" />
-    <MESSAGE value="新增获取设备最新数据接口" />
-    <MESSAGE value="修改设备检测值获取方法" />
-    <MESSAGE value="修改回去设备最新监测值程序" />
-    <MESSAGE value="修改文档上传参数不一致问题" />
-    <MESSAGE value="修改数据获取不一致问题" />
-    <MESSAGE value="修改报警设备类型统计" />
-    <MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
-    <MESSAGE value="新增维护类别" />
-    <MESSAGE value="修改施工数据新增删除编辑" />
-    <MESSAGE value="新增工器具耗材" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口" />
-    <MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
-    <MESSAGE value="报警管理异常处理" />
-    <MESSAGE value="增加道路表" />
-    <MESSAGE value="修改管线类型统计" />
-    <MESSAGE value="修改施工统计问题" />
-    <MESSAGE value="修改定位设备表结构设计" />
-    <MESSAGE value="去掉resource Set注释" />
-    <MESSAGE value="增加维护映射表" />
-    <MESSAGE value="设备控制部分增加刷选条件" />
-    <MESSAGE value="接入巡检维护表单和分析" />
-    <MESSAGE value="增加巡检维护查询时间检索功能" />
-    <MESSAGE value="修改气体传感器历史返回记录" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改气体传感器历史返回记录" />
+    <MESSAGE value="修改巡检维护查询条件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改巡检维护查询条件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
-          <line>47</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="330" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java</url>
-          <line>97</line>
-          <properties />
-          <option name="timeStamp" value="331" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java</url>
-          <line>32</line>
-          <properties />
-          <option name="timeStamp" value="342" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
-    <watches-manager>
-      <configuration name="Application">
-        <watch expression="postMethod.used" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1878,11 +1858,172 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
           <caret line="342" column="24" selection-start-line="342" selection-start-column="24" selection-end-line="342" selection-end-column="24" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/test/apiTestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-100">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6">
+          <caret line="196" column="34" lean-forward="true" selection-start-line="196" selection-start-column="34" selection-end-line="196" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-198">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="327" column="25" lean-forward="true" selection-start-line="327" selection-start-column="25" selection-end-line="327" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="484">
+          <caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="32" lean-forward="true" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1678">
+          <caret line="136" column="5" lean-forward="true" selection-start-line="136" selection-start-column="5" selection-end-line="136" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="139" column="16" lean-forward="true" selection-start-line="139" selection-start-column="16" selection-end-line="139" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="990">
+          <caret line="92" column="29" lean-forward="true" selection-start-line="92" selection-start-column="29" selection-end-line="92" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.0.6.RELEASE/spring-aop-4.0.6.RELEASE-sources.jar!/org/springframework/aop/framework/CglibAopProxy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="708" column="13" lean-forward="true" selection-start-line="708" selection-start-column="13" selection-end-line="708" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="257" column="41" lean-forward="true" selection-start-line="257" selection-start-column="41" selection-end-line="257" selection-end-column="41" />
+>>>>>>> refs/remotes/origin/develop
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="902">
           <caret line="67" column="44" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
         </state>
@@ -2047,10 +2188,169 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1929">
           <caret line="191" column="19" selection-start-line="191" selection-start-column="19" selection-end-line="191" selection-end-column="19" />
+=======
+        <state relative-caret-position="349">
+          <caret line="132" column="54" selection-start-line="132" selection-start-column="29" selection-end-line="132" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="266" column="96" selection-start-line="266" selection-start-column="96" selection-end-line="266" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="115" column="44" lean-forward="true" selection-start-line="115" selection-start-column="44" selection-end-line="115" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="132" column="28" selection-start-line="132" selection-start-column="18" selection-end-line="132" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="68" column="27" selection-start-line="68" selection-start-column="18" selection-end-line="68" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="25" column="13" lean-forward="true" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="30" column="72" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="36" column="107" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="107" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="16" column="20" lean-forward="true" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="66" column="35" lean-forward="true" selection-start-line="66" selection-start-column="35" selection-end-line="66" selection-end-column="35" />
+>>>>>>> refs/remotes/origin/develop
         </state>
       </provider>
       <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -2088,6 +2388,63 @@
           <caret line="63" column="49" lean-forward="true" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
           <folding>
             <element signature="imports" expanded="true" />
+=======
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" />
+            <element signature="method#getPgReservePlanByFileName#0;class#PgReservePlanManager#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-21">
+          <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+          <folding>
+            <element signature="e#1232#1248#0" expanded="true" />
+            <element signature="e#2028#2044#0" expanded="true" />
+            <element signature="method#editReservePlan#0;class#PgReservePlanRs#0" />
+            <element signature="method#delReservePlan#0;class#PgReservePlanRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="211" column="45" lean-forward="true" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="45" />
+          <folding>
+            <element signature="method#addConstructDoc#0;class#PgCsDocumentRs#0" />
+            <element signature="method#editReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="method#deleteReservePlan#0;class#PgCsDocumentRs#0" />
+            <element signature="e#5758#5774#0" expanded="true" />
+            <element signature="e#5843#5860#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentManager#0" />
+            <element signature="method#readInputStream#0;class#PgCsDocumentManager#0" />
+            <element signature="method#getDtoByObject#0;class#PgCsDocumentManager#0" />
+>>>>>>> refs/remotes/origin/develop
           </folding>
         </state>
       </provider>
@@ -2102,7 +2459,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
                 <option value="0.5" />
               </list>
             </option>
@@ -2115,7 +2472,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2123,11 +2480,10 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2139,7 +2495,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.2" />
               </list>
             </option>
           </splitter-proportions>
@@ -2151,7 +2507,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2159,7 +2515,7 @@
       </state>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2175,7 +2531,7 @@
           <splitter-proportions>
             <option name="proportions">
               <list>
-                <option value="0.27701148" />
+                <option value="0.38850576" />
               </list>
             </option>
           </splitter-proportions>
@@ -2183,7 +2539,4 @@
       </state>
     </states>
   </component>
-  <component name="mavenExecuteGoalHistory">
-    <option value="" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/PgInterface.iml b/PgInterface.iml
index 4f7bbb3..061ff19 100644
--- a/PgInterface.iml
+++ b/PgInterface.iml
@@ -23,7 +23,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: junit:junit:4.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
diff --git a/pom.xml b/pom.xml
index 9caadb7..e018708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,43 +709,6 @@
 <build>
     <finalName>PgInterface</finalName>
     <plugins>
-        <!--     <plugin>
-                 &lt;!&ndash;
-                 <groupId>org.codehaus.cargo</groupId>
-                 <artifactId>cargo-maven2-plugin</artifactId>
-                 <version>1.0</version>
-                 <configuration>
-                     <container>
-                         <containerId>tomcat6x</containerId>
-                         <type>remote</type>
-                     </container>
-                     <configuration>
-                         <type>runtime</type>
-                         <properties>
-                             <cargo.remote.username>tomcat</cargo.remote.username>
-                             <cargo.remote.password>tomcat</cargo.remote.password>
-                             <cargo.remote.uri>http://192.168.0.203:8080/manager/text</cargo.remote.uri>
-                         </properties>
-
-                         <deployables>
-                             <deployable>
-                                 <groupId>com.fiobox</groupId>
-                                 <artifactId>fiobox</artifactId>
-                                 <type>war</type>
-                             </deployable>
-                         </deployables>
-
-                     </configuration>
-                 </configuration>
-         &ndash;&gt;
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>tomcat-maven-plugin</artifactId>
-                 <configuration>
-                     <url>http://192.168.0.203:8080/manager/text</url>
-                     <server>test</server>
-                     <path>/xxfw</path>
-                 </configuration>
-             </plugin>-->
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
index a928236..78fd2ac 100644
--- a/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
+++ b/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java
@@ -26,7 +26,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private PgPartition pgPartitionId;//施工区域
+//    private PgPartition pgPartitionId;//施工区域
+    private String pgName;//所属仓
     private PgConstructionType pgConstructionTypeId;//项目状态
     private List<PgCsDocument> pgCsDocumentList;//施工文档
     private int active;//状态位
@@ -72,17 +73,27 @@
 
     public void setCs_type(String cs_type){ this.cs_type = cs_type; }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "PAPARTITION_ID")
-    public PgPartition getPgPartitionId() {
-        return pgPartitionId;
+
+    @Column(name = "PGNAME")
+    public String getPgName() {
+        return pgName;
     }
 
-    public void setPgPartitionId(PgPartition pgPartitionId) {
-        this.pgPartitionId = pgPartitionId;
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
     }
 
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "PAPARTITION_ID")
+//    public PgPartition getPgPartitionId() {
+//        return pgPartitionId;
+//    }
+//
+//    public void setPgPartitionId(PgPartition pgPartitionId) {
+//        this.pgPartitionId = pgPartitionId;
+//    }
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgConstructionId")
     public List<PgCsDocument> getPgCsDocumentList() {
         return pgCsDocumentList;
diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
index 2e23fca..ff5ff18 100644
--- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
+++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java
@@ -16,8 +16,8 @@
     private String cs_charge;//施工负责人
     private String cs_phone;//联系方式
     private String cs_type;//工程类别
-    private String parName;//施工区域
     private String ConstructionType;//项目状态
+    private String pgName;//所属仓
     private String active;//状态位
     private String doc_name;//施工文档
 
@@ -85,14 +85,6 @@
         this.cs_type = cs_type;
     }
 
-    public String getParName() {
-        return parName;
-    }
-
-    public void setParName(String parName) {
-        this.parName = parName;
-    }
-
     public String getActive(){ return active; }
 
     public void setActive(String active){ this.active = active; }
@@ -113,6 +105,14 @@
         this.doc_name = doc_name;
     }
 
+    public String getPgName() {
+        return pgName;
+    }
+
+    public void setPgName(String pgName) {
+        this.pgName = pgName;
+    }
+
     public PgConstructionDto(PgConstruction pgConstruction) {
 
         if (pgConstruction == null) {
@@ -134,15 +134,13 @@
             this.setCs_charge(pgConstruction.getCs_charge());
             this.setCs_phone(pgConstruction.getCs_phone());
             this.setCs_type(pgConstruction.getCs_type());
-            if(pgConstruction.getPgPartitionId()==null)
-                this.setParName("");
-            else
-                this.setParName(pgConstruction.getPgPartitionId().getParName());
+
             if(pgConstruction.getPgConstructionTypeId()==null)
                 this.setConstructionType("");
             else
                 this.setConstructionType(pgConstruction.getPgConstructionTypeId().getTypeName());
             this.setActive(String.valueOf(pgConstruction.getActive()));
+            this.setPgName(pgConstruction.getPgName());
         }
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
index 0bb6158..0d96c76 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java
@@ -42,13 +42,14 @@
             return pgConstructionList.get(0);
     }
 
-    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, PgPartition pgPartition, String startTime, String endTime) {
+    public List<PgConstruction> getPgContructionByNameOrType(String cs_name, String cs_type, String pgName,
+                                                             String startTime, String endTime) {
 
         try {
             Criteria criteria = createCriteria(PgConstruction.class);
             criteria.addOrder(Order.desc("id"));
-            if (pgPartition != null)
-                criteria.add(Restrictions.eq("pgPartitionId", pgPartition));
+            if (StringUtils.isNotBlank(pgName))
+                criteria.add(Restrictions.eq("pgName", pgName));
             if (StringUtils.isNotBlank(cs_name))
                 criteria.add(Restrictions.eq("cs_name", cs_name));
             if (StringUtils.isNotBlank(cs_type))
@@ -71,13 +72,12 @@
         }
     }
 
-    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String parName, String startTime, String endTime) {
+    public List<PgConstructionDto> getPgContructionDtoByNameOrType(String cs_name, String cs_type, String pgName,
+                                                                   String startTime, String endTime) {
 
-        PgPartition pgPartition=null;
-        if(parName!="")
-            pgPartition = pgPartitionManager.getPartitionByParName(parName);
+        PgPartition pgPartition=null;;
 
-        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgPartition, startTime, endTime);
+        List<PgConstruction> pgConstructionList = getPgContructionByNameOrType(cs_name, cs_type, pgName, startTime, endTime);
         List<PgConstructionDto> pgConstructionDtoList = new ArrayList<PgConstructionDto>();
 
         for (PgConstruction pgConstruction : pgConstructionList) {
@@ -114,9 +114,9 @@
         }
         sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 ";
 
-        if(!startTime.equals(""))
+        if(StringUtils.isNotBlank(startTime))
             sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')";
-        if(!endTime.equals(""))
+        if(StringUtils.isNotBlank(endTime))
             sql+=" and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd')";
 
         sql+="group by to_char(t.CS_BEGINTIME, '" + dateType + "')";
@@ -134,13 +134,13 @@
         return pgConstructionStiatisticList;
     }
 
-    public List<PgConstructionStiatistic> getStatisticByPar(String statisticType){
+    public List<PgConstructionStiatistic> getStatisticByPar(){
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
         String str="PAPARTITION_ID";
 
         try {
-            String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," +
-                    "count(*) as count from pg_construction t group by t.PAPARTITION_ID";
+            String hql="select pgName as pgName," +
+                    "count(*) as count from pg_construction t group by t.pgName";
 
             List<Object[]> objects=this.getSession().createSQLQuery(hql).list();
             PgConstructionParStatisticDto pgConstructionParStatisticDto=null;
@@ -158,7 +158,7 @@
         }
     }
 
-    public List<PgConstructionStiatistic> getStatisticByType(String statisticType) {
+    public List<PgConstructionStiatistic> getStatisticByType() {
         List<PgConstructionStiatistic> pgConstructionStiatisticList = new ArrayList<PgConstructionStiatistic>();
 
         String str="CS_TYPE";
@@ -218,7 +218,7 @@
 
     public List<PgConstructionDto> getPgConstructionList() {
         String sql = "SELECT t.ID,t.CS_NAME,t.CS_DETAIL,t.CS_BEGINTIME,t.CS_ENDTIME,t.CS_CHARGE,t.CS_PHONE,t.CS_TYPE,t.ACTIVE, " +
-                "(SELECT m.PARNAME FROM PG_PARTITION m WHERE m.ID = t.PAPARTITION_ID) AS PARNAME, " +
+                "t.PGNAME, " +
                 "(SELECT n.TYPENAME FROM PG_CONSTRUCTION_TYPE n WHERE n.ID = t.PGCONSTRUCTIONTYPE_ID) AS TYPENAME" +
                 " FROM PG_CONSTRUCTION t WHERE ACTIVE = 1";
 
@@ -237,8 +237,8 @@
             pgConstructionDto.setCs_phone(String.valueOf(objects.get(i)[6]));
             pgConstructionDto.setCs_type(String.valueOf(objects.get(i)[7]));
             pgConstructionDto.setActive(String.valueOf(objects.get(i)[8]));
-            pgConstructionDto.setParName(String.valueOf(objects.get(i)[9]));
-            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setPgName(String.valueOf(objects.get(i)[9]));
+            pgConstructionDto.setConstructionType(String.valueOf(objects.get(i)[10]));
             pgConstructionDtoList.add(pgConstructionDto);
         }
         return pgConstructionDtoList;
diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
index 737836b..67be508 100644
--- a/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
+++ b/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java
@@ -4,13 +4,16 @@
 import com.casic.PgInterface.construction.domain.PgCsDocument;
 import com.casic.PgInterface.construction.dto.PgCsDocumentDto;
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+
+import org.apache.commons.codec.binary.Base64;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +45,8 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+//            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -70,7 +74,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             /*MediaType mediaType = new MediaType("text", "html", Charset.forName("UTF-8"));*/
             headers.add("Content-Disposition",file.getName());
@@ -88,6 +94,17 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
     /*查询*/
     public List<PgCsDocumentDto> getAllDocData(String cs_name ,String cs_type,String startTime,String endTime) {
 
@@ -95,8 +112,11 @@
         try {
             List<PgConstruction> pgConstructionList = pgConstructionManager.getPgContructionByNameOrType(cs_name,
                     cs_type, null,startTime, endTime);
-            if(pgConstructionList==null||pgConstructionList.size()==0)
-                return null;
+            if(pgConstructionList==null||pgConstructionList.size()==0) {
+
+                pgCsDocumentDtoList=getAllPgCsDocument();
+                return pgCsDocumentDtoList;
+            }
             else
             {
                 for(PgConstruction pgConstruction : pgConstructionList)
@@ -116,8 +136,7 @@
         }
     }
 
-    private PgCsDocumentDto getDtoByObject(Object[] objectArray)
-    {
+    private PgCsDocumentDto getDtoByObject(Object[] objectArray){
         PgCsDocumentDto pgCsDocumentDto=new PgCsDocumentDto();
 
         pgCsDocumentDto.setId(String.valueOf(objectArray[0]));
@@ -129,4 +148,16 @@
         return pgCsDocumentDto;
     }
 
+    public List<PgCsDocumentDto> getAllPgCsDocument() {
+        Criteria criteria=createCriteria(PgCsDocument.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        List<PgCsDocument> pgCsDocumentList=criteria.list();
+        List<PgCsDocumentDto> pgCsDocumentDtoList = new ArrayList<PgCsDocumentDto>();
+        for (PgCsDocument pgCsDocument : pgCsDocumentList) {
+            pgCsDocumentDtoList.add(new PgCsDocumentDto(pgCsDocument));
+        }
+        return pgCsDocumentDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
index 955d4d5..eafd0c8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java
@@ -19,7 +19,6 @@
 
     private long id;
     private String parName;//分区名称
-//    private String road;//所属道路
     private String pgPosition;//仓段位置
     private String pgNum;//仓位数量
     private String pgType;//仓位类型
@@ -29,7 +28,7 @@
     private int active;//状态位
     private long pgRoadId;//所属道路
     private List<PipeGallery> pipeGalleryList;//管廊仓
-    private List<PgConstruction> pgConstructionList;//施工
+//    private List<PgConstruction> pgConstructionList;//施工
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PARTITION_ID")
@@ -141,12 +140,12 @@
         this.pipeGalleryList = pipeGalleryList;
     }
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
-    public List<PgConstruction> getPgConstructionList() {
-        return pgConstructionList;
-    }
-
-    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
-        this.pgConstructionList = pgConstructionList;
-    }
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgPartitionId")
+//    public List<PgConstruction> getPgConstructionList() {
+//        return pgConstructionList;
+//    }
+//
+//    public void setPgConstructionList(List<PgConstruction> pgConstructionList) {
+//        this.pgConstructionList = pgConstructionList;
+//    }
 }
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
index 57fd50d..1de1c9e 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java
@@ -16,6 +16,7 @@
     private String description;//描述
     private String alarmDevName;//报警设备
     private String alarmLocation;//报警位置
+    private String assetCode;//资产编号
     private String userName;//责任人
     private String phoneNumber;//联系电话
     private String active;//状态
@@ -109,7 +110,16 @@
         this.devType = devType;
     }
 
+    public String getAssetCode() {
+        return assetCode;
+    }
+
+    public void setAssetCode(String assetCode) {
+        this.assetCode = assetCode;
+    }
+
     public PgAlarmDto(PgAlarm pgAlarm) {
+        if(pgAlarm==null) return;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgAlarm.getId()));
@@ -123,12 +133,31 @@
         else
             this.setAlarmDate("");
         this.setDescription(pgAlarm.getDescription());
-        this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
-        this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
-        this.setUserName(pgAlarm.getUserId().getUserName());
-        this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        if(pgAlarm.getAlarmDevId()==null)
+        {
+            this.setAlarmDevName("");
+            this.setAlarmLocation("");
+            this.setAssetCode("");
+            this.setDevType("");
+        }
+        else
+        {
+            this.setAlarmDevName(pgAlarm.getAlarmDevId().getAssetName());
+            this.setAlarmLocation(pgAlarm.getAlarmDevId().getPosition());
+            this.setAssetCode(pgAlarm.getAlarmDevId().getAssetCode());
+            this.setDevType(pgAlarm.getAlarmDevId().getDevType());
+        }
+        if(pgAlarm.getUserId()==null)
+        {
+            this.setUserName("");
+            this.setPhoneNumber("");
+        }
+        else {
+            this.setUserName(pgAlarm.getUserId().getUserName());
+            this.setPhoneNumber(pgAlarm.getUserId().getPhoneNumber());
+        }
+
         this.setActive(String.valueOf(pgAlarm.getActive()));
-        this.setDevType(pgAlarm.getAlarmDevId().getDevType());
     }
 
 }
\ No newline at end of file
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 6a33267..569c9c3 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -113,6 +113,38 @@
         return pgDeviceDtoList;
     }
 
+    //根据分区获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPartition(String partition) {
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.eq("partition",partition));
+        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
+    //根据设备位置(仓位)获取摄像机列表
+    public List<PgDeviceDto> getPgCameraListByPosition(String position){
+        Criteria criteria=createCriteria(PgDevice.class);
+        criteria.add(Restrictions.like("position",position+"%"));
+//        criteria.add(Restrictions.eq("devType","球机"));
+        criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
+
+        List<PgDevice> pgDeviceList=criteria.list();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
+
+        for (PgDevice pgDevice : pgDeviceList) {
+            pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
+        }
+        return pgDeviceDtoList;
+    }
+
     public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode) {
         String[] stringList=assetCode.split("\\.");
 
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
index ab0908b..8ebf74d 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java
@@ -31,13 +31,16 @@
             return null;
     }
 
-    public List<PgEquipmentDto> getEquipmentDtiList()
+    public List<PgEquipmentDto> getEquipmentDtiList(String eqName,String eqCode, String eqType)
     {
         Criteria criteria=createCriteria(PgEquipment.class);
+        criteria.add(Restrictions.eq("eqName",eqName));
+        criteria.add(Restrictions.eq("eqCode",eqCode));
+        criteria.add(Restrictions.eq("eqType",eqType));
         criteria.add(Restrictions.eq("active",1));
 
         List<PgEquipment> pgEquipmentList=criteria.list();
-        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<PgEquipmentDto>();
+        List<PgEquipmentDto> pgEquipmentDtoList = new ArrayList<>();
         for(PgEquipment pgEquipment:pgEquipmentList)
         {
             pgEquipmentDtoList.add(new PgEquipmentDto(pgEquipment));
@@ -46,15 +49,23 @@
         return pgEquipmentDtoList;
     }
 
-
     //统计工器具耗材数量
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType(String eqType){
         //String eqType1=eqType.equals("0")?"工器具":"耗材";
 
-        String hql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
+        String sql="select equipment.EQ_NAME,count(*) from PG_EQUIPMENT equipment where equipment.EQ_TYPE = '"
         +eqType+"' group by equipment.EQ_NAME";
 
-        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
+        List<Object[]> objects=this.getSession().createSQLQuery(sql).list();
+        List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=new ArrayList<>();
+
+        for(Object[] objects1:objects){
+            PgDeviceTypeStatisticDto pgDeviceTypeStatisticDto=new PgDeviceTypeStatisticDto();
+            pgDeviceTypeStatisticDto.setDevType(objects1[0].toString());
+            pgDeviceTypeStatisticDto.setNum(objects1[1].toString());
+
+            pgDeviceTypeStatisticDtoList.add(pgDeviceTypeStatisticDto);
+        }
 
         return pgDeviceTypeStatisticDtoList;
     }
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
index 89a5df9..5346b57 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java
@@ -13,7 +13,7 @@
     private String planKeyId;//维修保养计划ID
     private String planName;//维修保养名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -66,15 +66,16 @@
         this.recordNo = recordNo;
     }
 
-    @Column(name="REOAIRMAN")
-    public String getReoairMan() {
-        return reoairMan;
+    @Column(name="REPAIRMAN")
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     @Column(name="MAINTENANCE_DATE")
     public String getMaintenanceDate() {
         return maintenanceDate;
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
index 2922121..17c180a 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java
@@ -9,7 +9,7 @@
     private Long id;
     private String planName;//维修柏安阳名称
     private String recordNo;//维修保养单号
-    private String reoairMan;//维修人
+    private String repairMan;//维修人
     private String maintenanceDate;//维修保养日期
     private String buildCabin;//舱室
     private String project;//所属项目
@@ -40,14 +40,15 @@
         this.recordNo = recordNo;
     }
 
-    public String getReoairMan() {
-        return reoairMan;
+    public String getRepairMan() {
+        return repairMan;
     }
 
-    public void setReoairMan(String reoairMan) {
-        this.reoairMan = reoairMan;
+    public void setRepairMan(String repairMan) {
+        this.repairMan = repairMan;
     }
 
+
     public String getMaintenanceDate() {
         return maintenanceDate;
     }
@@ -95,7 +96,7 @@
         pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId());
         pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName());
         pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo());
-        pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan());
+        pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan());
         pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate());
         pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin());
         pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
index 5463995..c41ca7d 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
@@ -12,15 +12,14 @@
 @Service
 public class PgAssetInSpectionRecordManager extends HibernateEntityDao<PgAssetInSpectionRecord> {
 
-    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgAssetInSpectionRecordDto> getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
         try {
             String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
                     "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
                     "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+
+            if(patrolMan!=null)
+                sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
index 4786bca..0903f22 100644
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
+++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java
@@ -13,14 +13,12 @@
 public class PgMaintanceRecordHeadManager extends HibernateEntityDao<PgMaintanceRecordHead> {
 
 
-    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){
+    public List<PgMaintanceRecordHeadDto> getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){
         try {
-            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," +
+            String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," +
                     "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1";
-            if(recordNo!=null)
-                sql+=" and RECORD_NO like '%"+recordNo+"%'";
-            if(planName!=null)
-                sql+=" and PLAN_NAME like '%"+planName+"%'";
+            if(repairMan!=null)
+                sql+=" and REPAIRMAN like '%"+repairMan+"%'";
             if(startTime!=null)
                 sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
             if(endTime!=null)
@@ -38,7 +36,7 @@
                 pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2]));
                 pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3]));
                 pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4]));
-                pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5]));
+                pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5]));
                 pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6]));
                 pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7]));
                 pgMaintanceRecordHead.setProject(String.valueOf(objects1[8]));
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 3323ba4..da3cacb 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,6 +1,7 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import com.casic.PgInterface.devTable.domain.PgDevice;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 
@@ -22,6 +23,7 @@
     private String unit;//单位
     private String devType;//设备类型
     private PgAlarmType alarmTypeId;//报警类型
+    private Long pgDeviceId;//设备编号
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -69,6 +71,15 @@
         this.devType = devType;
     }
 
+    @Column(name = "PGDEVICEID")
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     @NotFound(action = NotFoundAction.IGNORE)
     @JoinColumn(name = "ALARMTYPEID")
@@ -79,4 +90,5 @@
     public void setAlarmTypeId(PgAlarmType alarmTypeId) {
         this.alarmTypeId = alarmTypeId;
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index fcffe3f..9cc2881 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -13,6 +13,7 @@
     private String devType;//设备类型
     private String unit;//单位
     private String alarmType;//报警类型
+    private Long pgDeviceId;//设备编号
 
     public Long getId() {
         return id;
@@ -62,6 +63,14 @@
         this.alarmType = alarmType;
     }
 
+    public Long getPgDeviceId() {
+        return pgDeviceId;
+    }
+
+    public void setPgDeviceId(Long pgDeviceId) {
+        this.pgDeviceId = pgDeviceId;
+    }
+
     public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(pgAlarmRule.getId());
         this.setHighValue(pgAlarmRule.getHighValue());
@@ -72,6 +81,7 @@
             this.setAlarmType("");
         else
             this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
+        this.setPgDeviceId(pgAlarmRule.getPgDeviceId());
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index 64c1467..d97e316 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -72,6 +72,7 @@
     }
 
     public PgReservePlanDto(PgReservePlan pgReservePlan) {
+        this.setId(String.valueOf(pgReservePlan.getId()));
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
         if (pgReservePlan.getPgAlarmTypeId() == null)
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 64056b7..4384fb6 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.devTable.domain.PgAlarm;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
+import org.apache.commons.codec.binary.Base64;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,7 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.misc.BASE64Decoder;
+
 
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.*;
@@ -27,8 +28,9 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
-    public List<PgReservePlanDto> getpgReservePlanDto() {
+    public List<PgReservePlanDto> getPgReservePlanDto() {
         Criteria criteria=createCriteria(PgReservePlan.class);
+        criteria.add(Restrictions.eq("active",1));
 
         List<PgReservePlan> pgReservePlanList=criteria.list();
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
@@ -48,7 +50,9 @@
             String image_toDir = strDirPath + "\\"+fileType;//存储路径
             String imageName = "";
             imageName += fileType+"/"+fileName;
-            byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffer);//对android传过来的图片字符串进行解码
+
+            byte[] buffer = Base64.decodeBase64(fileBuffer.getBytes());
+
             File destDir = new File(image_toDir);
             if (!destDir.exists())
                 destDir.mkdirs();
@@ -88,8 +92,7 @@
         }
     }
 
-    public boolean getPgReservePlanByFileName(String planName)
-    {
+    public boolean getPgReservePlanByFileName(String planName){
         String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
 
         Object object=this.getSession().createSQLQuery(sql).uniqueResult();
@@ -101,7 +104,7 @@
     }
 
     /*下载文件*/
-    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+    public  ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
         try {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String path = request.getSession().getServletContext().getRealPath("");
@@ -110,7 +113,9 @@
             byte[] body = null;
             InputStream inputStream = new FileInputStream(file);
             body = new byte[inputStream.available()];
+//            body=readInputStream(inputStream);
             inputStream.read(body);
+
             HttpHeaders headers = new HttpHeaders();
             headers.add("Content-Disposition",file.getName());
             HttpStatus status = HttpStatus.OK;
@@ -124,4 +129,15 @@
         }
     }
 
+    public byte[] readInputStream(InputStream inStream) throws Exception{
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);;
+        }
+//        inStream.close();
+        return outStream.toByteArray();
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
index e8e8f67..b8d52c7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java
@@ -45,7 +45,7 @@
     @Path("linkDevice")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
         PgDeviceDto pgDeviceDto = null;
@@ -66,20 +66,20 @@
     }
 
     /*
-    * 获取报警设备所在区域的所有设备信息
+     * 获取报警设备所在仓位的所有摄像机
      */
     @POST
-    @Path("linkPartitionDevice")
+    @Path("linkPartitionCamera")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> linkPartitionDevice(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+    public Map<String, Object> linkPartitionCamera(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
         try {
             PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
             PgDevice pgDevice = pgAlarm.getAlarmDevId();
-            pgDeviceDtoList = pgDeviceManager.getPgDeviceDtoListByPartition(pgDevice.getPartition());
+            pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
 
             msg = "关联设备获取成功";
         } catch (Exception e) {
@@ -98,10 +98,10 @@
     @Path("linkReservePlan")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> linkReservePlan(@FormParam("id") String id) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
 
-        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<PgReservePlanDto>();
+        List<PgReservePlanDto> pgReservePlanDtoList=new ArrayList<>();
         try{
             PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
             pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
index e336309..66f4d09 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgAssetRecordList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgAssetRecordList(@FormParam("recordNo") String recordNo,
-                                                   @FormParam("planName") String planName,
+    public Map<String,Object> getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
                                                    @FormParam("startTime") String startTime,
                                                    @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgAssetInSpectionRecordDto> pgAssetInSpectionRecordDtoList=new ArrayList<>();
         try{
-            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime);
+            pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
             if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
                 msg="巡检信息获取成功";
             else
@@ -49,7 +48,7 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgAssetInSpectionRecordDtoList);
+        resultMap.put("result",pgAssetInSpectionRecordDtoList);
 
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index a417e84..e7447d2 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -58,7 +58,7 @@
                                                @FormParam("cs_charge")String cs_charge,
                                                @FormParam("cs_phone")String cs_phone,
                                                @FormParam("cs_type")String cs_type,
-                                               @FormParam("parName")String parName)
+                                               @FormParam("pgName") String pgName)
     throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
@@ -67,14 +67,10 @@
         try {
 
             PgConstructionType pgConstructionType = pgConstructionTypeManager.getConstructionTypeByType(constructionType);
-            PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName);
             if (pgConstructionType==null) {
                 result = "false";
                 msg = "保存失败,不存在项目状态:"+"constructionType";
-            } else if (pgPartition==null) {
-                result = "false";
-                msg = "保存失败，不存在施工区域:"+parName;
-            } else {
+            }  else {
                 PgConstruction pgConstruction = new PgConstruction();
                 pgConstruction.setCs_name(cs_name);
                 pgConstruction.setCs_detail(cs_detail);
@@ -84,11 +80,9 @@
                 pgConstruction.setCs_phone(cs_phone);
                 pgConstruction.setCs_type(cs_type);
 
-                pgConstruction.setPgPartitionId(pgPartition);
-
                 pgConstruction.setPgConstructionTypeId(pgConstructionType);
                 pgConstruction.setActive(1);
-
+                pgConstruction.setPgName(pgName);
                 logger.info("保存成功");
                 pgConstructionManager.save(pgConstruction);
                 result = "true";
@@ -119,7 +113,7 @@
                                                 @FormParam("cs_charge")String cs_charge,
                                                 @FormParam("cs_phone")String cs_phone,
                                                 @FormParam("cs_type")String cs_type,
-                                                @FormParam("parName")String parName)
+                                                @FormParam("pgName") String pgName)
     throws Exception{
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
@@ -136,8 +130,6 @@
                 }else {
                     PgConstructionType pgConstructionType=pgConstructionTypeManager.getConstructionTypeByType(constructionType);
 
-                    PgPartition pgPartition=pgPartitionManager.getPartitionByParName(parName);
-
                     PgConstruction pgConstruction = pgConstructionManager.get(Long.valueOf(id));
                     pgConstruction.setCs_name(cs_name);
                     pgConstruction.setCs_detail(cs_detail);
@@ -146,9 +138,9 @@
                     pgConstruction.setCs_charge(cs_charge);
                     pgConstruction.setCs_phone(cs_phone);
                     pgConstruction.setCs_type(cs_type);
-                    pgConstruction.setPgPartitionId(pgPartition);
                     pgConstruction.setPgConstructionTypeId(pgConstructionType);
                     pgConstruction.setActive(1);
+                    pgConstruction.setPgName(pgName);
 
                     pgConstructionManager.save(pgConstruction);
                     result = "true";
@@ -209,14 +201,14 @@
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> searchConstruction(@FormParam("cs_name")String cs_name,
                                                   @FormParam("cs_type")String cs_type,
-                                                  @FormParam("parName")String parName,
+                                                  @FormParam("pgName")String pgName,
                                                   @FormParam("startTime")String startTime,
                                                   @FormParam("endTime")String endTime)throws Exception{
         Map<String,Object> resultMap=new HashMap<String, Object>();
         String msg="";
         List<PgConstructionDto> pgConstructionDtoList=new ArrayList<PgConstructionDto>();
         try{
-            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,parName,startTime,endTime);
+            pgConstructionDtoList=pgConstructionManager.getPgContructionDtoByNameOrType(cs_name,cs_type,pgName,startTime,endTime);
             msg="信息获取成功";
         }
         catch(Exception e)
@@ -270,8 +262,8 @@
         List<PgConstructionStiatistic> pgConstructionStiatisticList=new ArrayList<PgConstructionStiatistic>();
 
         try{
-            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType):
-                    pgConstructionManager.getStatisticByPar(statisticType);
+            pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType():
+                    pgConstructionManager.getStatisticByPar();
             msg="统计信息获取成功";
         }
         catch(Exception e)
@@ -325,7 +317,7 @@
 
             PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
 
-            pgDeviceDtoList=pgDeviceManager.getPgDeviceDtoListByPartition(pgConstruction.getPgPartitionId().getParName());
+            pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
 
             if(pgDeviceDtoList==null)
                 msg="信息获取失败";
@@ -344,7 +336,7 @@
     }
 
     /*
-  * 获取维护信息
+  * 获取施工信息
    */
     @POST
     @Path("getConstruction")
@@ -375,4 +367,4 @@
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index b1fe121..455e9af 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -220,7 +220,7 @@
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
index 6b48f0e..1c8130c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgEquipmentRs.java
@@ -131,13 +131,15 @@
     @POST
     @Path("getEquipment")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getEquipment() throws Exception {
+    public Map<String, Object> getEquipment(@FormParam("eqName") String eqName,
+                                            @FormParam("eqCode") String eqCode,
+                                            @FormParam("eqType") String eqType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgEquipmentDto> pgEquipmentDtoList=new ArrayList<PgEquipmentDto>();
 
         try{
-            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList();
+            pgEquipmentDtoList=pgEquipmentManager.getEquipmentDtiList(eqName,eqCode,eqType);
             if(pgEquipmentDtoList==null||pgEquipmentDtoList.size()==0)
                 msg="不存在工器具记录";
             else
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index bf9fb9d..b506338 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgDeviceDto;
+import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.domain.PgInPgStatus;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
@@ -30,6 +32,9 @@
     @Resource
     private PgInPgStatusManager pgInPgStatusManager;
 
+    @Resource
+    private PgDeviceManager pgDeviceManager;
+
     /**
      * 派发工作证（新增入廊记录）
      */
@@ -256,4 +261,35 @@
         return resultMap;
     }
 
+    @POST
+    @Path("getDevListByAp")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDevListByAp(@FormParam("apCode")String apCode) throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
+
+        try {
+            if (apCode != "") {
+                String apCodeStr=apCode.substring(0,3);
+                pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+                if(pgDeviceDtoList==null)
+                    msg="不存在关联摄像机";
+                else
+                    msg="关联摄像机获取成功";
+            } else {
+                msg="请输入Ap编号";
+            }
+        }
+        catch(Exception ex){
+            ex.printStackTrace();
+            msg="关联摄像机获取成功";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+        return resultMap;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
index d741777..d735cc9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java
@@ -28,8 +28,7 @@
     @POST
     @Path("getPgMaintanceList")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getPgMaintanceList(@FormParam("recordNo") String recordNo,
-                                                 @FormParam("planName") String planName,
+    public Map<String,Object> getPgMaintanceList(@FormParam("repairMan") String repairMan,
                                                  @FormParam("startTime") String startTime,
                                                  @FormParam("endTime") String endTime){
         Map<String,Object> resultMap=new HashMap<>();
@@ -37,7 +36,7 @@
 
         List<PgMaintanceRecordHeadDto> pgMaintanceRecordHeadDtoList=new ArrayList<>();
         try{
-            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime);
+            pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime);
             if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0)
                 msg="维护信息获取成功";
             else
@@ -49,9 +48,9 @@
         }
 
         resultMap.put("msg",msg);
-        resultMap.put("resutl",pgMaintanceRecordHeadDtoList);
+        resultMap.put("result",pgMaintanceRecordHeadDtoList);
 
         return resultMap;
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 8f2cc69..672b376 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -8,6 +8,7 @@
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
 
 import javax.annotation.Resource;
 import javax.ws.rs.FormParam;
@@ -34,7 +35,7 @@
     private PgAlarmTypeManager pgAlarmTypeManager;
 
     /*
-   * 获取角色信息
+   * 获取预案信息
     */
     @POST
     @Path("getReservePlan")
@@ -44,7 +45,7 @@
         String msg = "";
         List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
         try {
-            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            pgReservePlanDtoList = pgReservePlanManager.getPgReservePlanDto();
             if (pgReservePlanDtoList == null)
                 msg = "不存在预案信息";
             else
@@ -69,17 +70,17 @@
         try {
             PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
             path = pgReservePlanManager.downloadFile(pgReservePlan);
+
             if (path == null)
                 msg = "不存在该文档";
             else
                 msg = "下载成功";
-
         } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
 
-        resultMap.put("result", path);
+        resultMap.put("result", path.getBody());
         resultMap.put("msg", msg);
         return resultMap;
     }
@@ -210,7 +211,7 @@
                 msg="不存在该预案信息";
             }
             else{
-                pgReservePlan.setActive(0);
+                pgReservePlan.setActive(0);;
                 pgReservePlanManager.save(pgReservePlan);
                 result="true";
                 msg="删除成功";
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index f64ac25..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
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\21620190522.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
new file mode 100644
index 0000000..a4ec716
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620181227.docx" "b/~$\350\257\264\346\230\21620181227.docx"
new file mode 100644
index 0000000..44e5569
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620181227.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190527.docx" "b/~$\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..c68c40b
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190527.docx"
Binary files differ
diff --git a/~WRL0009.tmp b/~WRL0009.tmp
deleted file mode 100644
index e3653c8..0000000
--- a/~WRL0009.tmp
+++ /dev/null
Binary files differ
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
deleted file mode 100644
index c307c0b..0000000
--- a/~WRL2471.tmp
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190527.docx"
new file mode 100644
index 0000000..833b97a
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190527.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\21620181120.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\21620181120.docx"
deleted file mode 100644
index 70b12e0..0000000
--- "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\21620181120.docx"
+++ /dev/null
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\21620190522.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\21620190522.docx"
new file mode 100644
index 0000000..ff3fe91
--- /dev/null
+++ "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\21620190522.docx"
Binary files differ