diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
index b8eb791..bf2a86f 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
@@ -16,7 +16,9 @@
     private String inTime;//入廊时间
     private String outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
+    private String dt;//日期
     private String inPgNums;//累计入廊次数
 
     public String getId() {
@@ -75,6 +77,22 @@
         this.inPgNums = inPgNums;
     }
 
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public String getIsInPg() {
+        return isInPg;
+    }
+
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
+
     public PgInPgPersonDto(PgInPgPerson pgInPgPerson) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -84,6 +102,7 @@
         this.setType(pgInPgPerson.getType());
         this.setInTime(sdf.format(pgInPgPerson.getInTime()));
         this.setOutTime(sdf.format(pgInPgPerson.getOutTime()));
+        this.setIsInPg(pgInPgPerson.getIsInPg());
     }
 
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
index b8eb791..bf2a86f 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
@@ -16,7 +16,9 @@
     private String inTime;//入廊时间
     private String outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
+    private String dt;//日期
     private String inPgNums;//累计入廊次数
 
     public String getId() {
@@ -75,6 +77,22 @@
         this.inPgNums = inPgNums;
     }
 
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public String getIsInPg() {
+        return isInPg;
+    }
+
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
+
     public PgInPgPersonDto(PgInPgPerson pgInPgPerson) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -84,6 +102,7 @@
         this.setType(pgInPgPerson.getType());
         this.setInTime(sdf.format(pgInPgPerson.getInTime()));
         this.setOutTime(sdf.format(pgInPgPerson.getOutTime()));
+        this.setIsInPg(pgInPgPerson.getIsInPg());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
index 02b2ec3..7e842a6 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
@@ -1,26 +1,105 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.DateUtils;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 /**
  * Created by yxw on 2018/3/22.
  */
 @Service
-public class PgInPgPersonManager extends HibernateEntityDao {
+public class PgInPgPersonManager extends HibernateEntityDao<PgInPgPerson> {
+
+    public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) {
+        List<PgInPgPerson> pgInPgPersonList = null;
+        try {
+            Criteria criteria = createCriteria(PgInPgPerson.class);
+            if (StringUtils.isNotBlank(userName))
+                criteria.add(Restrictions.eq("userName", userName));
+
+            if (StringUtils.isNotBlank(inTime)) {
+                criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime)));
+            }
+            if (StringUtils.isNotBlank(outTime)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateUtils.sdf_day.parse(outTime));
+                calendar.add(Calendar.DATE, 1);
+                criteria.add(Restrictions.le("inTime", calendar.getTime()));
+            }
+
+            criteria.addOrder(Order.desc("id"));
+            pgInPgPersonList = criteria.list();
+
+            if (pgInPgPersonList != null && pgInPgPersonList.size() > 0)
+                return pgInPgPersonList.get(0);
+            else
+                return null;
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListInPg(){
+        Criteria criteria=createCriteria(PgInPgPerson.class);
+        criteria.add(Restrictions.eq("isInPg",1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgInPgPerson> pgInPgPersonList=criteria.list();
+        List<PgInPgPersonDto> pgInPgPersonDtoList=criteria.list();
+        for(PgInPgPerson pgInPgPerson:pgInPgPersonList)
+        {
+            pgInPgPersonDtoList.add(new PgInPgPersonDto(pgInPgPerson));
+        }
+        return pgInPgPersonDtoList;
+    }
 
     public List<PgInPgPersonDto> getPgInPersonList() {
-        List<PgInPgPersonDto> pgInPgPersonDtoList=new ArrayList<PgInPgPersonDto>();
-        Criteria criteria=createCriteria(PgInPgPersonDto.class);
-        criteria.addOrder(Order.desc("inTime"));
 
-        pgInPgPersonDtoList=criteria.list();
+        String hql = "select pgInPgPerson.userName,pgInPgPerson.phoneNumber,pgInPgPerson.inTime," +
+                "pgInPgPerson.outTime,pgInPgPerson.type,count(*) as inPgNums from PgInPgPerson pgInPgPerson " +
+                "group by pgInPgPerson.userName";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(hql).list();
+
+        return pgInPgPersonDtoList;
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListByTime(String year,String statisticType) {
+
+        String sql="";
+
+        int type=Integer.valueOf(statisticType);
+        switch(type) {
+            case 0://年
+                sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)";
+                break;
+            case 1://月
+                sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by month(inTime)";
+                break;
+            case 2://周
+                sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by datename(week,[inTime])";
+                break;
+            case 3://日
+                sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by day(inTime)";
+                break;
+            default:
+                break;
+        }
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list();
         return pgInPgPersonDtoList;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
index b8eb791..bf2a86f 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
@@ -16,7 +16,9 @@
     private String inTime;//入廊时间
     private String outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
+    private String dt;//日期
     private String inPgNums;//累计入廊次数
 
     public String getId() {
@@ -75,6 +77,22 @@
         this.inPgNums = inPgNums;
     }
 
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public String getIsInPg() {
+        return isInPg;
+    }
+
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
+
     public PgInPgPersonDto(PgInPgPerson pgInPgPerson) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -84,6 +102,7 @@
         this.setType(pgInPgPerson.getType());
         this.setInTime(sdf.format(pgInPgPerson.getInTime()));
         this.setOutTime(sdf.format(pgInPgPerson.getOutTime()));
+        this.setIsInPg(pgInPgPerson.getIsInPg());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
index 02b2ec3..7e842a6 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
@@ -1,26 +1,105 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.DateUtils;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 /**
  * Created by yxw on 2018/3/22.
  */
 @Service
-public class PgInPgPersonManager extends HibernateEntityDao {
+public class PgInPgPersonManager extends HibernateEntityDao<PgInPgPerson> {
+
+    public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) {
+        List<PgInPgPerson> pgInPgPersonList = null;
+        try {
+            Criteria criteria = createCriteria(PgInPgPerson.class);
+            if (StringUtils.isNotBlank(userName))
+                criteria.add(Restrictions.eq("userName", userName));
+
+            if (StringUtils.isNotBlank(inTime)) {
+                criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime)));
+            }
+            if (StringUtils.isNotBlank(outTime)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateUtils.sdf_day.parse(outTime));
+                calendar.add(Calendar.DATE, 1);
+                criteria.add(Restrictions.le("inTime", calendar.getTime()));
+            }
+
+            criteria.addOrder(Order.desc("id"));
+            pgInPgPersonList = criteria.list();
+
+            if (pgInPgPersonList != null && pgInPgPersonList.size() > 0)
+                return pgInPgPersonList.get(0);
+            else
+                return null;
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListInPg(){
+        Criteria criteria=createCriteria(PgInPgPerson.class);
+        criteria.add(Restrictions.eq("isInPg",1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgInPgPerson> pgInPgPersonList=criteria.list();
+        List<PgInPgPersonDto> pgInPgPersonDtoList=criteria.list();
+        for(PgInPgPerson pgInPgPerson:pgInPgPersonList)
+        {
+            pgInPgPersonDtoList.add(new PgInPgPersonDto(pgInPgPerson));
+        }
+        return pgInPgPersonDtoList;
+    }
 
     public List<PgInPgPersonDto> getPgInPersonList() {
-        List<PgInPgPersonDto> pgInPgPersonDtoList=new ArrayList<PgInPgPersonDto>();
-        Criteria criteria=createCriteria(PgInPgPersonDto.class);
-        criteria.addOrder(Order.desc("inTime"));
 
-        pgInPgPersonDtoList=criteria.list();
+        String hql = "select pgInPgPerson.userName,pgInPgPerson.phoneNumber,pgInPgPerson.inTime," +
+                "pgInPgPerson.outTime,pgInPgPerson.type,count(*) as inPgNums from PgInPgPerson pgInPgPerson " +
+                "group by pgInPgPerson.userName";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(hql).list();
+
+        return pgInPgPersonDtoList;
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListByTime(String year,String statisticType) {
+
+        String sql="";
+
+        int type=Integer.valueOf(statisticType);
+        switch(type) {
+            case 0://年
+                sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)";
+                break;
+            case 1://月
+                sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by month(inTime)";
+                break;
+            case 2://周
+                sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by datename(week,[inTime])";
+                break;
+            case 3://日
+                sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by day(inTime)";
+                break;
+            default:
+                break;
+        }
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list();
         return pgInPgPersonDtoList;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index fdbc486..3b808ec 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,7 +1,7 @@
 package com.casic.PgInterface.rs;
 
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
-import com.casic.PgInterface.patroler.dto.PgLogDto;
+import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,10 +14,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2018/3/23.
@@ -49,10 +46,10 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-            PgInPgPerson pgInPgPerson=new PgInPgPerson();
+            PgInPgPerson pgInPgPerson = new PgInPgPerson();
             pgInPgPerson.setUserName(userName);
             pgInPgPerson.setPhoneNumber(phoneNumber);
             pgInPgPerson.setInTime(sdf.parse(inTime));
@@ -79,25 +76,140 @@
     @POST
     @Path("getInPgPerson")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getInPgPerson()throws Exception {
+    public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
         try {
-            //pgLogDtoList = pgInPgPersonManager
-            if (pgLogDtoList == null || pgLogDtoList.size() == 0)
-                msg = "没有找到日志信息";
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
             else
-                msg = "日志信息获取成功";
+                msg = "入廊人员信息获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "日志信息获取失败";
+            msg = "入廊人员信息获取失败";
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", pgLogDtoList);
+        resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
     }
 
+    /**
+     * 获取在线人员信息列表
+     */
+    @POST
+    @Path("getInPgPersonInPg")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonInPg() throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonListInPg();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据人员名称获取人员信息
+     */
+    @POST
+    @Path("getInPgPersonByName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName,
+                                                   @FormParam("inTime") String inTime,
+                                                   @FormParam("outTime") String outTime) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        PgInPgPerson pgInPgPerson=null;
+        try {
+            pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
+            if (pgInPgPerson == null)
+                msg = "不存在人员信息";
+            else
+                msg = "人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPerson);
+        return resultMap;
+    }
+
+    /**
+     * 人员出廊确认
+     */
+    @POST
+    @Path("outPgPerson")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> outPgPerson(@FormParam("userName") String userName) throws Exception {
+
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPersonByUserName(userName);
+            pgInPgPerson.setOutTime(new Date());
+            pgInPgPerson.setIsInPg("0");
+
+            pgInPgPersonManager.save(pgInPgPerson);
+            result = "true";
+            msg = "编辑成功";
+            //}
+        } catch (Exception e) {
+            result = "false";
+            msg = "编辑失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+        return resultMap;
+    }
+
+    /**
+     * 根据时间统计入廊人员次数
+     */
+    @POST
+    @Path("getInPgPersonByTime")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByTime(@FormParam("year") String year,
+                                                   @FormParam("statisticType") String statisticType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员统计信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员统计信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+
 
 
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
index b8eb791..bf2a86f 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
@@ -16,7 +16,9 @@
     private String inTime;//入廊时间
     private String outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
+    private String dt;//日期
     private String inPgNums;//累计入廊次数
 
     public String getId() {
@@ -75,6 +77,22 @@
         this.inPgNums = inPgNums;
     }
 
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public String getIsInPg() {
+        return isInPg;
+    }
+
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
+
     public PgInPgPersonDto(PgInPgPerson pgInPgPerson) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -84,6 +102,7 @@
         this.setType(pgInPgPerson.getType());
         this.setInTime(sdf.format(pgInPgPerson.getInTime()));
         this.setOutTime(sdf.format(pgInPgPerson.getOutTime()));
+        this.setIsInPg(pgInPgPerson.getIsInPg());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
index 02b2ec3..7e842a6 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
@@ -1,26 +1,105 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.DateUtils;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 /**
  * Created by yxw on 2018/3/22.
  */
 @Service
-public class PgInPgPersonManager extends HibernateEntityDao {
+public class PgInPgPersonManager extends HibernateEntityDao<PgInPgPerson> {
+
+    public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) {
+        List<PgInPgPerson> pgInPgPersonList = null;
+        try {
+            Criteria criteria = createCriteria(PgInPgPerson.class);
+            if (StringUtils.isNotBlank(userName))
+                criteria.add(Restrictions.eq("userName", userName));
+
+            if (StringUtils.isNotBlank(inTime)) {
+                criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime)));
+            }
+            if (StringUtils.isNotBlank(outTime)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateUtils.sdf_day.parse(outTime));
+                calendar.add(Calendar.DATE, 1);
+                criteria.add(Restrictions.le("inTime", calendar.getTime()));
+            }
+
+            criteria.addOrder(Order.desc("id"));
+            pgInPgPersonList = criteria.list();
+
+            if (pgInPgPersonList != null && pgInPgPersonList.size() > 0)
+                return pgInPgPersonList.get(0);
+            else
+                return null;
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListInPg(){
+        Criteria criteria=createCriteria(PgInPgPerson.class);
+        criteria.add(Restrictions.eq("isInPg",1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgInPgPerson> pgInPgPersonList=criteria.list();
+        List<PgInPgPersonDto> pgInPgPersonDtoList=criteria.list();
+        for(PgInPgPerson pgInPgPerson:pgInPgPersonList)
+        {
+            pgInPgPersonDtoList.add(new PgInPgPersonDto(pgInPgPerson));
+        }
+        return pgInPgPersonDtoList;
+    }
 
     public List<PgInPgPersonDto> getPgInPersonList() {
-        List<PgInPgPersonDto> pgInPgPersonDtoList=new ArrayList<PgInPgPersonDto>();
-        Criteria criteria=createCriteria(PgInPgPersonDto.class);
-        criteria.addOrder(Order.desc("inTime"));
 
-        pgInPgPersonDtoList=criteria.list();
+        String hql = "select pgInPgPerson.userName,pgInPgPerson.phoneNumber,pgInPgPerson.inTime," +
+                "pgInPgPerson.outTime,pgInPgPerson.type,count(*) as inPgNums from PgInPgPerson pgInPgPerson " +
+                "group by pgInPgPerson.userName";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(hql).list();
+
+        return pgInPgPersonDtoList;
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListByTime(String year,String statisticType) {
+
+        String sql="";
+
+        int type=Integer.valueOf(statisticType);
+        switch(type) {
+            case 0://年
+                sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)";
+                break;
+            case 1://月
+                sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by month(inTime)";
+                break;
+            case 2://周
+                sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by datename(week,[inTime])";
+                break;
+            case 3://日
+                sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by day(inTime)";
+                break;
+            default:
+                break;
+        }
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list();
         return pgInPgPersonDtoList;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index fdbc486..3b808ec 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,7 +1,7 @@
 package com.casic.PgInterface.rs;
 
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
-import com.casic.PgInterface.patroler.dto.PgLogDto;
+import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,10 +14,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2018/3/23.
@@ -49,10 +46,10 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-            PgInPgPerson pgInPgPerson=new PgInPgPerson();
+            PgInPgPerson pgInPgPerson = new PgInPgPerson();
             pgInPgPerson.setUserName(userName);
             pgInPgPerson.setPhoneNumber(phoneNumber);
             pgInPgPerson.setInTime(sdf.parse(inTime));
@@ -79,25 +76,140 @@
     @POST
     @Path("getInPgPerson")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getInPgPerson()throws Exception {
+    public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
         try {
-            //pgLogDtoList = pgInPgPersonManager
-            if (pgLogDtoList == null || pgLogDtoList.size() == 0)
-                msg = "没有找到日志信息";
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
             else
-                msg = "日志信息获取成功";
+                msg = "入廊人员信息获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "日志信息获取失败";
+            msg = "入廊人员信息获取失败";
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", pgLogDtoList);
+        resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
     }
 
+    /**
+     * 获取在线人员信息列表
+     */
+    @POST
+    @Path("getInPgPersonInPg")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonInPg() throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonListInPg();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据人员名称获取人员信息
+     */
+    @POST
+    @Path("getInPgPersonByName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName,
+                                                   @FormParam("inTime") String inTime,
+                                                   @FormParam("outTime") String outTime) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        PgInPgPerson pgInPgPerson=null;
+        try {
+            pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
+            if (pgInPgPerson == null)
+                msg = "不存在人员信息";
+            else
+                msg = "人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPerson);
+        return resultMap;
+    }
+
+    /**
+     * 人员出廊确认
+     */
+    @POST
+    @Path("outPgPerson")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> outPgPerson(@FormParam("userName") String userName) throws Exception {
+
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPersonByUserName(userName);
+            pgInPgPerson.setOutTime(new Date());
+            pgInPgPerson.setIsInPg("0");
+
+            pgInPgPersonManager.save(pgInPgPerson);
+            result = "true";
+            msg = "编辑成功";
+            //}
+        } catch (Exception e) {
+            result = "false";
+            msg = "编辑失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+        return resultMap;
+    }
+
+    /**
+     * 根据时间统计入廊人员次数
+     */
+    @POST
+    @Path("getInPgPersonByTime")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByTime(@FormParam("year") String year,
+                                                   @FormParam("statisticType") String statisticType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员统计信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员统计信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+
 
 
 }
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"
new file mode 100644
index 0000000..244d6f0
--- /dev/null
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
index b8eb791..bf2a86f 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
@@ -16,7 +16,9 @@
     private String inTime;//入廊时间
     private String outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
+    private String dt;//日期
     private String inPgNums;//累计入廊次数
 
     public String getId() {
@@ -75,6 +77,22 @@
         this.inPgNums = inPgNums;
     }
 
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public String getIsInPg() {
+        return isInPg;
+    }
+
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
+
     public PgInPgPersonDto(PgInPgPerson pgInPgPerson) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -84,6 +102,7 @@
         this.setType(pgInPgPerson.getType());
         this.setInTime(sdf.format(pgInPgPerson.getInTime()));
         this.setOutTime(sdf.format(pgInPgPerson.getOutTime()));
+        this.setIsInPg(pgInPgPerson.getIsInPg());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
index 02b2ec3..7e842a6 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
@@ -1,26 +1,105 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.DateUtils;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 /**
  * Created by yxw on 2018/3/22.
  */
 @Service
-public class PgInPgPersonManager extends HibernateEntityDao {
+public class PgInPgPersonManager extends HibernateEntityDao<PgInPgPerson> {
+
+    public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) {
+        List<PgInPgPerson> pgInPgPersonList = null;
+        try {
+            Criteria criteria = createCriteria(PgInPgPerson.class);
+            if (StringUtils.isNotBlank(userName))
+                criteria.add(Restrictions.eq("userName", userName));
+
+            if (StringUtils.isNotBlank(inTime)) {
+                criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime)));
+            }
+            if (StringUtils.isNotBlank(outTime)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateUtils.sdf_day.parse(outTime));
+                calendar.add(Calendar.DATE, 1);
+                criteria.add(Restrictions.le("inTime", calendar.getTime()));
+            }
+
+            criteria.addOrder(Order.desc("id"));
+            pgInPgPersonList = criteria.list();
+
+            if (pgInPgPersonList != null && pgInPgPersonList.size() > 0)
+                return pgInPgPersonList.get(0);
+            else
+                return null;
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListInPg(){
+        Criteria criteria=createCriteria(PgInPgPerson.class);
+        criteria.add(Restrictions.eq("isInPg",1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgInPgPerson> pgInPgPersonList=criteria.list();
+        List<PgInPgPersonDto> pgInPgPersonDtoList=criteria.list();
+        for(PgInPgPerson pgInPgPerson:pgInPgPersonList)
+        {
+            pgInPgPersonDtoList.add(new PgInPgPersonDto(pgInPgPerson));
+        }
+        return pgInPgPersonDtoList;
+    }
 
     public List<PgInPgPersonDto> getPgInPersonList() {
-        List<PgInPgPersonDto> pgInPgPersonDtoList=new ArrayList<PgInPgPersonDto>();
-        Criteria criteria=createCriteria(PgInPgPersonDto.class);
-        criteria.addOrder(Order.desc("inTime"));
 
-        pgInPgPersonDtoList=criteria.list();
+        String hql = "select pgInPgPerson.userName,pgInPgPerson.phoneNumber,pgInPgPerson.inTime," +
+                "pgInPgPerson.outTime,pgInPgPerson.type,count(*) as inPgNums from PgInPgPerson pgInPgPerson " +
+                "group by pgInPgPerson.userName";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(hql).list();
+
+        return pgInPgPersonDtoList;
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListByTime(String year,String statisticType) {
+
+        String sql="";
+
+        int type=Integer.valueOf(statisticType);
+        switch(type) {
+            case 0://年
+                sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)";
+                break;
+            case 1://月
+                sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by month(inTime)";
+                break;
+            case 2://周
+                sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by datename(week,[inTime])";
+                break;
+            case 3://日
+                sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by day(inTime)";
+                break;
+            default:
+                break;
+        }
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list();
         return pgInPgPersonDtoList;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index fdbc486..3b808ec 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,7 +1,7 @@
 package com.casic.PgInterface.rs;
 
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
-import com.casic.PgInterface.patroler.dto.PgLogDto;
+import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,10 +14,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2018/3/23.
@@ -49,10 +46,10 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-            PgInPgPerson pgInPgPerson=new PgInPgPerson();
+            PgInPgPerson pgInPgPerson = new PgInPgPerson();
             pgInPgPerson.setUserName(userName);
             pgInPgPerson.setPhoneNumber(phoneNumber);
             pgInPgPerson.setInTime(sdf.parse(inTime));
@@ -79,25 +76,140 @@
     @POST
     @Path("getInPgPerson")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getInPgPerson()throws Exception {
+    public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
         try {
-            //pgLogDtoList = pgInPgPersonManager
-            if (pgLogDtoList == null || pgLogDtoList.size() == 0)
-                msg = "没有找到日志信息";
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
             else
-                msg = "日志信息获取成功";
+                msg = "入廊人员信息获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "日志信息获取失败";
+            msg = "入廊人员信息获取失败";
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", pgLogDtoList);
+        resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
     }
 
+    /**
+     * 获取在线人员信息列表
+     */
+    @POST
+    @Path("getInPgPersonInPg")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonInPg() throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonListInPg();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据人员名称获取人员信息
+     */
+    @POST
+    @Path("getInPgPersonByName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName,
+                                                   @FormParam("inTime") String inTime,
+                                                   @FormParam("outTime") String outTime) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        PgInPgPerson pgInPgPerson=null;
+        try {
+            pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
+            if (pgInPgPerson == null)
+                msg = "不存在人员信息";
+            else
+                msg = "人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPerson);
+        return resultMap;
+    }
+
+    /**
+     * 人员出廊确认
+     */
+    @POST
+    @Path("outPgPerson")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> outPgPerson(@FormParam("userName") String userName) throws Exception {
+
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPersonByUserName(userName);
+            pgInPgPerson.setOutTime(new Date());
+            pgInPgPerson.setIsInPg("0");
+
+            pgInPgPersonManager.save(pgInPgPerson);
+            result = "true";
+            msg = "编辑成功";
+            //}
+        } catch (Exception e) {
+            result = "false";
+            msg = "编辑失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+        return resultMap;
+    }
+
+    /**
+     * 根据时间统计入廊人员次数
+     */
+    @POST
+    @Path("getInPgPersonByTime")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByTime(@FormParam("year") String year,
+                                                   @FormParam("statisticType") String statisticType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员统计信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员统计信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+
 
 
 }
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"
new file mode 100644
index 0000000..244d6f0
--- /dev/null
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
new file mode 100644
index 0000000..fccdb82
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a31c37a..60bced2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\接口说明.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\管廊数据库设计说明.docx" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -36,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgInPgPerson.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-              <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="PgInPgPersonDto.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-              <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+              <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -59,36 +48,57 @@
       <file leaf-file-name="PgInPgPersonManager.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-              <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+              <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#571#588#0" expanded="true" />
+                <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+                <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+                <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <file leaf-file-name="PgLogRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-              <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#2681#2697#0" expanded="true" />
-                <element signature="e#2777#2787#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+              <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgLogManager.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PgLogManager.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-              <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-              <folding />
+            <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+              <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgInPgPersonRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+              <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+                <element signature="e#6338#6354#0" expanded="true" />
+                <element signature="e#6449#6466#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -128,13 +138,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.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/reservePlan/manager/PgReservePlanManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.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/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
       </list>
     </option>
   </component>
@@ -228,21 +238,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -398,6 +393,10 @@
               <option name="myItemId" value="patroler" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -433,6 +432,51 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -847,7 +891,8 @@
       <workItem from="1521421378549" duration="25551000" />
       <workItem from="1521592702651" duration="11581000" />
       <workItem from="1521679850876" duration="15242000" />
-      <workItem from="1521766120836" duration="8157000" />
+      <workItem from="1521766120836" duration="13351000" />
+      <workItem from="1521788409044" duration="8618000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -897,11 +942,15 @@
       <created>1521703079910</created>
       <updated>1521703079910</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="完成派发工作证功能">
+      <created>1521783169434</created>
+      <updated>1521783169434</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312560000" />
+    <option name="totallyTimeSpent" value="326372000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -928,7 +977,7 @@
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.635274" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -949,7 +998,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28021148" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2439577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -991,7 +1040,9 @@
     <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
-    <option name="LAST_COMMIT_MESSAGE" value="完成资产统计开发" />
+    <MESSAGE value="完成派发工作证功能" />
+    <MESSAGE value="完成入廊人员管理接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成入廊人员管理接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1003,20 +1054,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="950" max-vertical-offset="1955">
-          <caret line="80" column="28" selection-start-line="80" selection-start-column="28" selection-end-line="80" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="161" max-vertical-offset="4117">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="24" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4485">
@@ -1189,7 +1226,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.84770644" vertical-offset="0" max-vertical-offset="7964">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4874552" vertical-offset="828" max-vertical-offset="1518">
-          <caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6003584" vertical-offset="17" max-vertical-offset="858">
@@ -1261,13 +1290,6 @@
         </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">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="322" max-vertical-offset="880">
-          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
-        </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 vertical-scroll-proportion="0.9605735" vertical-offset="1092" max-vertical-offset="1870">
@@ -1308,7 +1330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07885305" vertical-offset="0" max-vertical-offset="1122">
           <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,18 +1337,71 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24856597" vertical-offset="2554" max-vertical-offset="8536">
           <caret line="151" column="18" selection-start-line="151" selection-start-column="18" selection-end-line="152" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.9605735" vertical-offset="410" max-vertical-offset="1166">
+          <caret line="113" column="5" selection-start-line="113" selection-start-column="5" selection-end-line="113" selection-end-column="5" />
+          <folding>
+            <element signature="method#setPipeGalleryManager#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1195#1200#0" expanded="false" />
+            <element signature="method#getPgStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="e#1730#1735#0" expanded="false" />
+            <element signature="method#getPipeLineStatistic#0;class#pgStatisticRs#0" expanded="false" />
+            <element signature="method#getDeviceStatistic#0;class#pgStatisticRs#0" expanded="false" />
+          </folding>
+        </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">
+        <state vertical-scroll-proportion="0.0" vertical-offset="322" max-vertical-offset="880">
+          <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
+          <folding>
+            <marker date="1521786417507" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+          </folding>
+        </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 vertical-scroll-proportion="1.2759857" vertical-offset="498" max-vertical-offset="1474">
+          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+          <folding>
+            <element signature="e#1824#1825#0" expanded="true" />
+            <element signature="e#1853#1854#0" expanded="true" />
+            <element signature="e#1897#1898#0" expanded="true" />
+            <element signature="e#1933#1934#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1070" max-vertical-offset="1650">
+          <caret line="101" column="45" selection-start-line="101" selection-start-column="45" selection-end-line="101" selection-end-column="45" />
+          <folding />
+        </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 vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="902">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </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 vertical-scroll-proportion="0.23476702" vertical-offset="1255" max-vertical-offset="2486">
-          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.3691756" vertical-offset="1664" max-vertical-offset="2222">
+          <caret line="246" column="5" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
           <folding>
             <element signature="method#setPgPartitionManager#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#setPipeGalleryManager#0;class#PgDeviceRs#0" expanded="false" />
-            <element signature="docComment;method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" expanded="false" />
             <element signature="e#3019#3024#0" expanded="false" />
             <element signature="method#getDeviceList#0;class#PgDeviceRs#0" expanded="false" />
@@ -1341,57 +1415,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="726" max-vertical-offset="1408">
-          <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.5519713" vertical-offset="660" max-vertical-offset="1298">
+          <caret line="25" column="44" selection-start-line="25" selection-start-column="44" selection-end-line="25" selection-end-column="44" />
           <folding />
         </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 vertical-scroll-proportion="0.0" vertical-offset="1254" max-vertical-offset="2530">
+          <caret line="138" column="57" selection-start-line="138" selection-start-column="57" selection-end-line="138" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#addInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonInPg#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#outPgPerson#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#getInPgPersonByTime#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="e#6338#6354#0" expanded="true" />
+            <element signature="e#6449#6466#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2365592" vertical-offset="762" max-vertical-offset="2244">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
-          <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
-          <folding />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="1320">
-          <caret line="45" column="47" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1356" max-vertical-offset="2244">
+          <caret line="45" column="9" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="36" max-vertical-offset="748">
-          <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="2244">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#571#588#0" expanded="true" />
+            <marker date="1521797679670" expanded="true" signature="2445:2682" placeholder="select pgInP..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3064:3131" placeholder="select count..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3203:3350" placeholder="select month..." />
+            <marker date="1521797679670" expanded="true" signature="3422:3589" placeholder="select daten..PgInPgPerson..." />
+            <marker date="1521797679670" expanded="true" signature="3661:3805" placeholder="select day(i..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44802868" vertical-offset="1510" max-vertical-offset="2398">
-          <caret line="80" column="41" selection-start-line="80" selection-start-column="41" selection-end-line="80" selection-end-column="41" />
+        <state vertical-scroll-proportion="0.19713262" vertical-offset="528" max-vertical-offset="1606">
+          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#2681#2697#0" expanded="true" />
-            <element signature="e#2777#2787#0" expanded="true" />
           </folding>
         </state>
       </provider>
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 2ef89cf..12e33a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -76,7 +76,7 @@
     //根据设备类型统计设备资产
     public List<PgDeviceTypeStatisticDto> getDeviceStatisticByDevType()
     {
-        String hql="select device.devType,count(*) from PG_DEVICE device group by devType";
+        String hql="select device.devType,count(*) from PG_DEVICE device group by device.devType";
 
         List<PgDeviceTypeStatisticDto> pgDeviceTypeStatisticDtoList=this.getSession().createSQLQuery(hql).list();
 
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
index 0e524f4..91219f8 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java
@@ -19,6 +19,7 @@
     private Date inTime;//入廊时间
     private Date outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_INPG_PERSON_ID")
@@ -75,5 +76,12 @@
         this.type = type;
     }
 
+    @Column(name = "ISINPG")
+    public String getIsInPg() {
+        return isInPg;
+    }
 
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
index b8eb791..bf2a86f 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java
@@ -16,7 +16,9 @@
     private String inTime;//入廊时间
     private String outTime;//出廊时间
     private String type;//人员类别
+    private String isInPg;//是否在廊内
 
+    private String dt;//日期
     private String inPgNums;//累计入廊次数
 
     public String getId() {
@@ -75,6 +77,22 @@
         this.inPgNums = inPgNums;
     }
 
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public String getIsInPg() {
+        return isInPg;
+    }
+
+    public void setIsInPg(String isInPg) {
+        this.isInPg = isInPg;
+    }
+
     public PgInPgPersonDto(PgInPgPerson pgInPgPerson) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -84,6 +102,7 @@
         this.setType(pgInPgPerson.getType());
         this.setInTime(sdf.format(pgInPgPerson.getInTime()));
         this.setOutTime(sdf.format(pgInPgPerson.getOutTime()));
+        this.setIsInPg(pgInPgPerson.getIsInPg());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
index 02b2ec3..7e842a6 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java
@@ -1,26 +1,105 @@
 package com.casic.PgInterface.patroler.manager;
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.DateUtils;
+import com.casic.PgInterface.core.util.StringUtils;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
 import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 /**
  * Created by yxw on 2018/3/22.
  */
 @Service
-public class PgInPgPersonManager extends HibernateEntityDao {
+public class PgInPgPersonManager extends HibernateEntityDao<PgInPgPerson> {
+
+    public PgInPgPerson getPersonByUserName(String userName,String inTime,String outTime) {
+        List<PgInPgPerson> pgInPgPersonList = null;
+        try {
+            Criteria criteria = createCriteria(PgInPgPerson.class);
+            if (StringUtils.isNotBlank(userName))
+                criteria.add(Restrictions.eq("userName", userName));
+
+            if (StringUtils.isNotBlank(inTime)) {
+                criteria.add(Restrictions.ge("inTime", DateUtils.sdf_day.parse(inTime)));
+            }
+            if (StringUtils.isNotBlank(outTime)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(DateUtils.sdf_day.parse(outTime));
+                calendar.add(Calendar.DATE, 1);
+                criteria.add(Restrictions.le("inTime", calendar.getTime()));
+            }
+
+            criteria.addOrder(Order.desc("id"));
+            pgInPgPersonList = criteria.list();
+
+            if (pgInPgPersonList != null && pgInPgPersonList.size() > 0)
+                return pgInPgPersonList.get(0);
+            else
+                return null;
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListInPg(){
+        Criteria criteria=createCriteria(PgInPgPerson.class);
+        criteria.add(Restrictions.eq("isInPg",1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgInPgPerson> pgInPgPersonList=criteria.list();
+        List<PgInPgPersonDto> pgInPgPersonDtoList=criteria.list();
+        for(PgInPgPerson pgInPgPerson:pgInPgPersonList)
+        {
+            pgInPgPersonDtoList.add(new PgInPgPersonDto(pgInPgPerson));
+        }
+        return pgInPgPersonDtoList;
+    }
 
     public List<PgInPgPersonDto> getPgInPersonList() {
-        List<PgInPgPersonDto> pgInPgPersonDtoList=new ArrayList<PgInPgPersonDto>();
-        Criteria criteria=createCriteria(PgInPgPersonDto.class);
-        criteria.addOrder(Order.desc("inTime"));
 
-        pgInPgPersonDtoList=criteria.list();
+        String hql = "select pgInPgPerson.userName,pgInPgPerson.phoneNumber,pgInPgPerson.inTime," +
+                "pgInPgPerson.outTime,pgInPgPerson.type,count(*) as inPgNums from PgInPgPerson pgInPgPerson " +
+                "group by pgInPgPerson.userName";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(hql).list();
+
+        return pgInPgPersonDtoList;
+    }
+
+    public List<PgInPgPersonDto> getPgInPersonListByTime(String year,String statisticType) {
+
+        String sql="";
+
+        int type=Integer.valueOf(statisticType);
+        switch(type) {
+            case 0://年
+                sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)";
+                break;
+            case 1://月
+                sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by month(inTime)";
+                break;
+            case 2://周
+                sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by datename(week,[inTime])";
+                break;
+            case 3://日
+                sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '"
+                        + year +"' group by day(inTime)";
+                break;
+            default:
+                break;
+        }
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list();
         return pgInPgPersonDtoList;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index fdbc486..3b808ec 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,7 +1,7 @@
 package com.casic.PgInterface.rs;
 
 import com.casic.PgInterface.patroler.domain.PgInPgPerson;
-import com.casic.PgInterface.patroler.dto.PgLogDto;
+import com.casic.PgInterface.patroler.dto.PgInPgPersonDto;
 import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,10 +14,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by yxw on 2018/3/23.
@@ -49,10 +46,10 @@
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-            PgInPgPerson pgInPgPerson=new PgInPgPerson();
+            PgInPgPerson pgInPgPerson = new PgInPgPerson();
             pgInPgPerson.setUserName(userName);
             pgInPgPerson.setPhoneNumber(phoneNumber);
             pgInPgPerson.setInTime(sdf.parse(inTime));
@@ -79,25 +76,140 @@
     @POST
     @Path("getInPgPerson")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getInPgPerson()throws Exception {
+    public Map<String, Object> getInPgPerson() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<PgLogDto> pgLogDtoList = new ArrayList<PgLogDto>();
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
         try {
-            //pgLogDtoList = pgInPgPersonManager
-            if (pgLogDtoList == null || pgLogDtoList.size() == 0)
-                msg = "没有找到日志信息";
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
             else
-                msg = "日志信息获取成功";
+                msg = "入廊人员信息获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "日志信息获取失败";
+            msg = "入廊人员信息获取失败";
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", pgLogDtoList);
+        resultMap.put("result", pgInPgPersonDtoList);
         return resultMap;
     }
 
+    /**
+     * 获取在线人员信息列表
+     */
+    @POST
+    @Path("getInPgPersonInPg")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonInPg() throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonListInPg();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据人员名称获取人员信息
+     */
+    @POST
+    @Path("getInPgPersonByName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByName(@FormParam("userName") String userName,
+                                                   @FormParam("inTime") String inTime,
+                                                   @FormParam("outTime") String outTime) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        PgInPgPerson pgInPgPerson=null;
+        try {
+            pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
+            if (pgInPgPerson == null)
+                msg = "不存在人员信息";
+            else
+                msg = "人员信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "人员信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPerson);
+        return resultMap;
+    }
+
+    /**
+     * 人员出廊确认
+     */
+    @POST
+    @Path("outPgPerson")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> outPgPerson(@FormParam("userName") String userName) throws Exception {
+
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String result = "";
+        String msg = "";
+
+        try {
+            PgInPgPerson pgInPgPerson=pgInPgPersonManager.getPersonByUserName(userName);
+            pgInPgPerson.setOutTime(new Date());
+            pgInPgPerson.setIsInPg("0");
+
+            pgInPgPersonManager.save(pgInPgPerson);
+            result = "true";
+            msg = "编辑成功";
+            //}
+        } catch (Exception e) {
+            result = "false";
+            msg = "编辑失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("result",result);
+        resultMap.put("msg",msg);
+        return resultMap;
+    }
+
+    /**
+     * 根据时间统计入廊人员次数
+     */
+    @POST
+    @Path("getInPgPersonByTime")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getInPgPersonByTime(@FormParam("year") String year,
+                                                   @FormParam("statisticType") String statisticType) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgInPgPersonDto> pgInPgPersonDtoList = new ArrayList<PgInPgPersonDto>();
+        try {
+            pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList();
+            if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0)
+                msg = "没有找到入廊人员信息";
+            else
+                msg = "入廊人员统计信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "入廊人员统计信息获取失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgPersonDtoList);
+        return resultMap;
+    }
+
+
 
 
 }
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"
new file mode 100644
index 0000000..244d6f0
--- /dev/null
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
new file mode 100644
index 0000000..fccdb82
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index d13a45e..64ea030 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ