<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="PgInterface" />
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
<change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
</list>
<ignored path="PgInterface.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/dataSources.local.xml" />
<ignored path="$PROJECT_DIR$/../out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
<component name="FUSProjectUsageTrigger">
<session id="515841449">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="10" />
<entry key="project.open.time.101" value="1" />
<entry key="project.open.time.140" value="1" />
<entry key="project.open.time.19" value="2" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.235" value="1" />
<entry key="project.open.time.246" value="1" />
<entry key="project.open.time.3" value="1" />
<entry key="project.open.time.5" value="1" />
<entry key="project.open.time.72" value="1" />
<entry key="project.open.time.76" value="1" />
<entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="13" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="class" value="1" />
<entry key="java" value="104" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages" />
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="3675" />
</counts>
</usages-collector>
<usages-collector id="statistics.js.language.service.starts" />
<usages-collector id="statistics.spring.boot.run.usages" />
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="3675" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="1" />
<entry key="JAVA" value="104" />
</counts>
</usages-collector>
<usages-collector id="statistics.spring.boot.mvc.usages" />
</session>
</component>
<component name="FavoritesManager">
<favorites_list name="PgInterface" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="25" selection-start-line="25" selection-end-line="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="26" selection-start-line="26" selection-end-line="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>pgPipeLineLengthStatic.setLineType(String.valueOf(objectArray[0]))</find>
<find>getDeviceStatisticByDevType</find>
<find>getPersonNumInPgByMonth</find>
<find>getConstructionToday</find>
<find>constructionType</find>
<find>getConstructionNum</find>
<find>getPipeGallerys</find>
<find>getInPgNum</find>
<find>getTodayInPgInfo</find>
</findStrings>
</component>
<component name="FindManager">
<FindUsagesManager>
<setting name="OPEN_NEW_TAB" value="true" />
</FindUsagesManager>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.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/domain/PgInPgStatus.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/rs/PgInPgPersonRs.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/PgInPgStatusRs.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="LogFilters">
<option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" />
<option name="FILTER_INFO" value="false" />
<option name="FILTER_DEBUG" value="false" />
<option name="CUSTOM_FILTER" />
</component>
<component name="MavenProjectNavigator">
<treeState>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PgInterface" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Dependencies" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$DependenciesNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PgInterface" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Dependencies" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$DependenciesNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="org.springframework:spring-test:4.0.6.RELEASE" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$DependencyNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PgInterface" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
</PATH>
</treeState>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-11" />
<option name="y" value="3" />
<option name="width" value="1378" />
<option name="height" value="744" />
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="construction" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="devData" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="devTable" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="patroler" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="PgInterface" type="462c0819:PsiDirectoryNode" />
<item name="rs" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="100" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="129" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="922" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="117" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="124" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="123" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="917" />
<property name="FullScreen" value="false" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="LayoutCode.rearrangeEntriesJava" value="false" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.sorted" value="false" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
<property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
<property name="options.lastSelected" value="xpath.settings" />
<property name="options.searchVisible" value="true" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="options.splitter.main.proportions" value="0.3" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.27701148" />
<property name="recentsLimit" value="5" />
</component>
<component name="PyConsoleOptionsProvider">
<option name="myPythonConsoleState">
<console-settings />
</option>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
<module name="" />
<option name="ACTIVITY_CLASS" value="" />
<option name="MODE" value="default_activity" />
<option name="DEPLOY" value="true" />
<option name="ARTIFACT_NAME" value="" />
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="USE_COMMAND_LINE" value="true" />
<option name="COMMAND_LINE" value="" />
<option name="WIPE_USER_DATA" value="false" />
<option name="DISABLE_BOOT_ANIMATION" value="false" />
<option name="NETWORK_SPEED" value="full" />
<option name="NETWORK_LATENCY" value="none" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
<method />
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
<module name="" />
<option name="TESTING_TYPE" value="0" />
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
<option name="METHOD_NAME" value="" />
<option name="CLASS_NAME" value="" />
<option name="PACKAGE_NAME" value="" />
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="USE_COMMAND_LINE" value="true" />
<option name="COMMAND_LINE" value="" />
<option name="WIPE_USER_DATA" value="false" />
<option name="DISABLE_BOOT_ANIMATION" value="false" />
<option name="NETWORK_SPEED" value="full" />
<option name="NETWORK_LATENCY" value="none" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
<method />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HEIGHT" value="0" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="WIDTH" value="0" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
<setting name="vmparams" value="" />
<setting name="cmdLine" value="run-app" />
<setting name="passParentEnv" value="true" />
<setting name="launchBrowser" value="false" />
<setting name="launchBrowserUrl" value="" />
<setting name="depsClasspath" value="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<method v="2" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="VM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<option name="VM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="PgInterface" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.33" ALTERNATIVE_JRE_ENABLED="false">
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<deployment>
<artifact name="PgInterface">
<settings>
<option name="CONTEXT_PATH" value="/PgInterface" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_PgInterface_10" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<RunnerSettings RunnerId="Cover" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="30962" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method v="2">
<option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true">
<artifact name="PgInterface" />
</option>
</method>
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
<option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
<option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
<deployment>
<artifact name="PgInterface">
<settings>
<option name="CONTEXT_PATH" value="/PgInterface" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="_PgInterface" />
<option name="HTTP_PORT" value="8080" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<RunnerSettings RunnerId="Cover" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="30962" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method v="2">
<option name="BuildArtifacts" enabled="true">
<artifact name="PgInterface" />
</option>
</method>
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
<component name="SliceManager">
<option name="analysisUIOptions">
<AnalysisUIOptions />
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="" />
<created>1510216318970</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1510216318970</updated>
<workItem from="1510216323228" duration="257000" />
<workItem from="1510216708376" duration="537000" />
<workItem from="1510217256782" duration="4544000" />
<workItem from="1510537985048" duration="8792000" />
<workItem from="1510648771840" duration="2424000" />
<workItem from="1510652452432" duration="2777000" />
<workItem from="1510717097014" duration="14020000" />
<workItem from="1511235200089" duration="65149000" />
<workItem from="1511831663100" duration="27116000" />
<workItem from="1512008211270" duration="5571000" />
<workItem from="1512019500219" duration="2765000" />
<workItem from="1512089814132" duration="2080000" />
<workItem from="1512198299673" duration="3073000" />
<workItem from="1512875238280" duration="10958000" />
<workItem from="1512954236216" duration="5617000" />
<workItem from="1512986830366" duration="1541000" />
<workItem from="1513044296718" duration="24015000" />
<workItem from="1513236092491" duration="4545000" />
<workItem from="1513318011925" duration="773000" />
<workItem from="1513732543084" duration="24598000" />
<workItem from="1514509437479" duration="5670000" />
<workItem from="1516938276978" duration="146000" />
<workItem from="1516938519485" duration="7509000" />
<workItem from="1517193457354" duration="118000" />
<workItem from="1517204757906" duration="13000" />
<workItem from="1517205202765" duration="7020000" />
<workItem from="1516946384508" duration="659000" />
<workItem from="1518138952553" duration="11010000" />
<workItem from="1519787471372" duration="705000" />
<workItem from="1521077217432" duration="2975000" />
<workItem from="1521162588157" duration="4433000" />
<workItem from="1521421378549" duration="25551000" />
<workItem from="1521592702651" duration="11581000" />
<workItem from="1521679850876" duration="15242000" />
<workItem from="1521766120836" duration="13351000" />
<workItem from="1521788409044" duration="9229000" />
<workItem from="1522025372319" duration="74846000" />
<workItem from="1522638476761" duration="9099000" />
<workItem from="1522651740541" duration="13960000" />
<workItem from="1522716581762" duration="2116000" />
<workItem from="1522720062586" duration="318000" />
<workItem from="1522720493529" duration="78000" />
<workItem from="1522720652490" duration="234000" />
<workItem from="1522721287997" duration="7541000" />
<workItem from="1522802524516" duration="12733000" />
<workItem from="1523148745408" duration="8835000" />
<workItem from="1523157765522" duration="919000" />
<workItem from="1523158719185" duration="18552000" />
<workItem from="1523237655585" duration="10919000" />
<workItem from="1523255625352" duration="5471000" />
<workItem from="1523261680058" duration="9282000" />
<workItem from="1523321007177" duration="1598000" />
<workItem from="1523324624594" duration="6759000" />
<workItem from="1523340421442" duration="3752000" />
<workItem from="1523432830885" duration="14216000" />
<workItem from="1523613196514" duration="2471000" />
<workItem from="1523841976838" duration="532000" />
<workItem from="1523847058149" duration="134000" />
<workItem from="1523850358421" duration="752000" />
<workItem from="1523926567015" duration="7287000" />
<workItem from="1524468119890" duration="10327000" />
<workItem from="1524530458679" duration="22256000" />
<workItem from="1524616879003" duration="14965000" />
<workItem from="1524703719577" duration="19417000" />
<workItem from="1524789884330" duration="13133000" />
<workItem from="1524811080604" duration="91000" />
<workItem from="1524811191147" duration="178000" />
<workItem from="1524811392186" duration="9271000" />
<workItem from="1524876075347" duration="2338000" />
<workItem from="1524911264765" duration="698000" />
<workItem from="1525222154707" duration="1238000" />
<workItem from="1525239390406" duration="7197000" />
<workItem from="1526029212185" duration="398000" />
<workItem from="1527647404942" duration="803000" />
<workItem from="1527736232361" duration="3613000" />
<workItem from="1528072908045" duration="8949000" />
<workItem from="1528085664975" duration="31000" />
<workItem from="1528085697357" duration="17009000" />
<workItem from="1528333983724" duration="2699000" />
<workItem from="1528349219682" duration="721000" />
<workItem from="1528421791812" duration="2287000" />
<workItem from="1528771293143" duration="9272000" />
<workItem from="1528961860313" duration="3105000" />
<workItem from="1530094500311" duration="4260000" />
<workItem from="1530146280841" duration="4637000" />
<workItem from="1530760861055" duration="38191000" />
<workItem from="1531271154753" duration="3320000" />
<workItem from="1531377872544" duration="2430000" />
<workItem from="1531461252664" duration="1261000" />
<workItem from="1531703142074" duration="10522000" />
<workItem from="1531792335849" duration="7749000" />
<workItem from="1532047483654" duration="5024000" />
<workItem from="1532230576899" duration="4412000" />
<workItem from="1532331902814" duration="16741000" />
<workItem from="1532911591262" duration="10758000" />
<workItem from="1533001245841" duration="2373000" />
<workItem from="1533084581197" duration="1960000" />
<workItem from="1533101056618" duration="2155000" />
<workItem from="1533103306468" duration="13612000" />
<workItem from="1533867281937" duration="8203000" />
<workItem from="1533958252285" duration="7449000" />
<workItem from="1534055827189" duration="11376000" />
<workItem from="1534236462504" duration="614000" />
<workItem from="1534246266526" duration="504000" />
<workItem from="1534744981704" duration="1407000" />
<workItem from="1534746406596" duration="2485000" />
<workItem from="1534758910752" duration="803000" />
<workItem from="1534814050131" duration="10836000" />
<workItem from="1534902063409" duration="1435000" />
<workItem from="1535001398046" duration="3063000" />
<workItem from="1535435890604" duration="619000" />
<workItem from="1535519592997" duration="923000" />
<workItem from="1535941063170" duration="9991000" />
<workItem from="1535958569443" duration="219000" />
<workItem from="1536111554952" duration="23051000" />
<workItem from="1536143316539" duration="3706000" />
<workItem from="1536195067076" duration="23586000" />
<workItem from="1536802841385" duration="18000" />
<workItem from="1537167144071" duration="1232000" />
<workItem from="1537236948589" duration="156000" />
<workItem from="1537237991303" duration="1733000" />
<workItem from="1537407751831" duration="7109000" />
<workItem from="1537428362090" duration="1221000" />
<workItem from="1537857007320" duration="1436000" />
<workItem from="1537880574942" duration="385000" />
<workItem from="1538991929393" duration="2278000" />
<workItem from="1539071751929" duration="888000" />
<workItem from="1539310257796" duration="203000" />
<workItem from="1539737377636" duration="1389000" />
<workItem from="1539748453426" duration="3012000" />
<workItem from="1539825960380" duration="4221000" />
<workItem from="1539832337492" duration="92000" />
<workItem from="1539832447529" duration="1000" />
<workItem from="1539832453292" duration="2856000" />
<workItem from="1539839857631" duration="10000" />
<workItem from="1540519803954" duration="11912000" />
<workItem from="1540610854375" duration="19720000" />
<workItem from="1540776190984" duration="10090000" />
<workItem from="1540801317279" duration="7290000" />
<workItem from="1541144212498" duration="800000" />
<workItem from="1541234096986" duration="590000" />
<workItem from="1541239096514" duration="902000" />
<workItem from="1541303711282" duration="5696000" />
<workItem from="1541379811355" duration="413000" />
</task>
<task id="LOCAL-00008" summary="按资产表修改设备表">
<created>1513847487904</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1513847487904</updated>
</task>
<task id="LOCAL-00009" summary="按资产表修改设备表">
<created>1514511858811</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1514511858811</updated>
</task>
<task id="LOCAL-00010" summary="修改新增文件方法 by ym">
<created>1517193532907</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1517193532907</updated>
</task>
<task id="LOCAL-00011" summary="新需求输入前上传">
<created>1521168093758</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1521168093758</updated>
</task>
<task id="LOCAL-00012" summary="完成资产统计开发">
<created>1521703079910</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1521703079910</updated>
</task>
<task id="LOCAL-00013" summary="完成派发工作证功能">
<created>1521783169434</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1521783169434</updated>
</task>
<task id="LOCAL-00014" summary="完成入廊人员管理接口">
<created>1521797941436</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1521797941436</updated>
</task>
<task id="LOCAL-00015" summary="完成设备监控管理接口">
<created>1522147450816</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1522147450816</updated>
</task>
<task id="LOCAL-00016" summary="完成巡检维护增删改查">
<created>1522229072869</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1522229072869</updated>
</task>
<task id="LOCAL-00017" summary="完成报警、报警阈值、巡检维护功能开发">
<created>1522302183280</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1522302183280</updated>
</task>
<task id="LOCAL-00018" summary="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能">
<created>1522312453288</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1522312453288</updated>
</task>
<task id="LOCAL-00019" summary="完成角色和权限管理功能">
<created>1522403777512</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1522403777512</updated>
</task>
<task id="LOCAL-00020" summary="修改人员入廊记录表和功能">
<created>1522663707296</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1522663707296</updated>
</task>
<task id="LOCAL-00021" summary="修改人员入廊记录表和功能">
<created>1522665630661</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1522665630661</updated>
</task>
<task id="LOCAL-00022" summary="修改人员入廊记录表和功能">
<created>1522719993330</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1522719993330</updated>
</task>
<task id="LOCAL-00023" summary="Merge remote-tracking branch 'origin/develop' into develop Conflicts: 	.idea/workspace.xml 	~$数据库设计说明新需求.docx 	管廊数据库设计说明新需求.docx ">
<created>1522720789330</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1522720789330</updated>
</task>
<task id="LOCAL-00024" summary="Merge remote-tracking branch 'origin/develop' into develop Conflicts: 	.idea/workspace.xml 	~$数据库设计说明新需求.docx 	管廊数据库设计说明新需求.docx ">
<created>1522721480805</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1522721480805</updated>
</task>
<task id="LOCAL-00025" summary="增加统计功能">
<created>1523156875732</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1523156875732</updated>
</task>
<task id="LOCAL-00026" summary="增加统计功能">
<created>1523157296047</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1523157296047</updated>
</task>
<task id="LOCAL-00027" summary="增加统计功能">
<created>1523157882560</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1523157882560</updated>
</task>
<task id="LOCAL-00028" summary="增加统计功能">
<created>1523158200071</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1523158200071</updated>
</task>
<task id="LOCAL-00029" summary="修改标注">
<created>1523158539385</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1523158539385</updated>
</task>
<task id="LOCAL-00030" summary="修改标注">
<created>1523158771384</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1523158771384</updated>
</task>
<task id="LOCAL-00031" summary="修改年月日统计问题">
<created>1523237727191</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1523237727191</updated>
</task>
<task id="LOCAL-00032" summary="完成报警综览">
<created>1523244710693</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1523244710693</updated>
</task>
<task id="LOCAL-00033" summary="private-public">
<created>1523251402143</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1523251402143</updated>
</task>
<task id="LOCAL-00034" summary="修改施工功能">
<created>1523267544495</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1523267544495</updated>
</task>
<task id="LOCAL-00035" summary="修改施工文档和不能反馈JSON问题">
<created>1523324732673</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1523324732673</updated>
</task>
<task id="LOCAL-00036" summary="新增项目状态管理">
<created>1523331535754</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1523331535754</updated>
</task>
<task id="LOCAL-00037" summary="修改时间检索的格式">
<created>1523436516632</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1523436516632</updated>
</task>
<task id="LOCAL-00038" summary="新增当天在建工程统计">
<created>1523494952341</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1523494952341</updated>
</task>
<task id="LOCAL-00039" summary="修改监测设备获取信息字段名称">
<created>1528783523876</created>
<option name="number" value="00039" />
<option name="presentableId" value="LOCAL-00039" />
<option name="project" value="LOCAL" />
<updated>1528783523876</updated>
</task>
<task id="LOCAL-00040" summary="增加新旧资产转换接口">
<created>1530148620571</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1530148620571</updated>
</task>
<task id="LOCAL-00041" summary="增加时间转换异常处理">
<created>1531106285620</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1531106285620</updated>
</task>
<task id="LOCAL-00042" summary="新增获取设备最新数据接口">
<created>1531108933085</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1531108933085</updated>
</task>
<task id="LOCAL-00043" summary="修改设备检测值获取方法">
<created>1531193513894</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1531193513894</updated>
</task>
<task id="LOCAL-00044" summary="修改回去设备最新监测值程序">
<created>1531219605437</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1531219605437</updated>
</task>
<task id="LOCAL-00045" summary="修改文档上传参数不一致问题">
<created>1531271701152</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1531271701152</updated>
</task>
<task id="LOCAL-00046" summary="修改数据获取不一致问题">
<created>1531724270576</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1531724270576</updated>
</task>
<task id="LOCAL-00047" summary="修改报警设备类型统计">
<created>1532073676460</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1532073676460</updated>
</task>
<task id="LOCAL-00048" summary="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档">
<created>1532918340435</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1532918340435</updated>
</task>
<task id="LOCAL-00049" summary="新增维护类别">
<created>1534829004719</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1534829004719</updated>
</task>
<task id="LOCAL-00050" summary="修改施工数据新增删除编辑">
<created>1535003616655</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1535003616655</updated>
</task>
<task id="LOCAL-00051" summary="新增工器具耗材">
<created>1535955574227</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1535955574227</updated>
</task>
<task id="LOCAL-00052" summary="新增工器具耗材">
<created>1535958368940</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1535958368940</updated>
</task>
<task id="LOCAL-00053" summary="根据华锐王工反馈测试，修改接口">
<created>1536224373164</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1536224373165</updated>
</task>
<task id="LOCAL-00054" summary="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式">
<created>1537415330536</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1537415330536</updated>
</task>
<task id="LOCAL-00055" summary="报警管理异常处理">
<created>1537858342900</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1537858342900</updated>
</task>
<task id="LOCAL-00056" summary="报警管理异常处理">
<created>1539848140370</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1539848140371</updated>
</task>
<option name="localTasksCounter" value="57" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1031351000" />
</component>
<component name="TodoView" selected-index="1">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-11" y="3" width="1378" height="744" extended-state="0" />
<layout>
<window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
<window_info id="Structure" order="1" weight="0.25" />
<window_info id="Palette	" order="2" />
<window_info id="Build Variants" order="3" side_tool="true" />
<window_info id="Favorites" order="4" side_tool="true" />
<window_info id="Web" order="5" side_tool="true" />
<window_info id="UI Designer" order="6" />
<window_info id="Capture Tool" order="7" />
<window_info id="Image Layers" order="8" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
<window_info anchor="bottom" id="Changes" order="7" />
<window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
<window_info anchor="bottom" id="IDEtalk Messages" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
<window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
<window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
<window_info anchor="bottom" id="Android" order="15" />
<window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
<window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="IDEtalk" order="4" />
<window_info anchor="right" id="Designer" order="5" />
<window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
<window_info anchor="right" id="Bean Validation" order="7" />
<window_info anchor="right" id="Palette" order="8" />
<window_info anchor="right" id="Maven Projects" order="9" />
<window_info anchor="right" id="Capture Analysis" order="10" />
<window_info anchor="right" id="Theme Preview" order="11" />
</layout>
<layout-to-restore>
<window_info id="Project" order="0" visible="true" weight="0.2602428" />
<window_info id="Structure" order="1" weight="0.25" />
<window_info id="Palette	" order="2" />
<window_info id="Build Variants" order="3" side_tool="true" />
<window_info id="Favorites" order="4" side_tool="true" />
<window_info id="Web" order="5" side_tool="true" />
<window_info id="UI Designer" order="6" />
<window_info id="Capture Tool" order="7" />
<window_info id="Image Layers" order="8" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
<window_info anchor="bottom" id="Changes" order="7" />
<window_info anchor="bottom" id="Java Enterprise" order="8" weight="0.32935154" />
<window_info anchor="bottom" id="IDEtalk Messages" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
<window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
<window_info anchor="bottom" id="Messages" order="14" weight="0.44027305" />
<window_info anchor="bottom" id="Android" order="15" />
<window_info anchor="bottom" id="Spring" order="16" weight="0.32935154" />
<window_info anchor="bottom" id="Database Changes" order="17" show_stripe_button="false" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="IDEtalk" order="4" />
<window_info anchor="right" id="Designer" order="5" />
<window_info anchor="right" id="Preview" order="6" weight="0.04845815" />
<window_info anchor="right" id="Bean Validation" order="7" />
<window_info anchor="right" id="Palette" order="8" />
<window_info anchor="right" id="Maven Projects" order="9" />
<window_info anchor="right" id="Capture Analysis" order="10" />
<window_info anchor="right" id="Theme Preview" order="11" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="修改年月日统计问题" />
<MESSAGE value="完成报警综览" />
<MESSAGE value="private-public" />
<MESSAGE value="修改施工功能" />
<MESSAGE value="修改施工文档和不能反馈JSON问题" />
<MESSAGE value="新增项目状态管理" />
<MESSAGE value="修改时间检索的格式" />
<MESSAGE value="新增当天在建工程统计" />
<MESSAGE value="修改监测设备获取信息字段名称" />
<MESSAGE value="增加新旧资产转换接口" />
<MESSAGE value="增加时间转换异常处理" />
<MESSAGE value="新增获取设备最新数据接口" />
<MESSAGE value="修改设备检测值获取方法" />
<MESSAGE value="修改回去设备最新监测值程序" />
<MESSAGE value="修改文档上传参数不一致问题" />
<MESSAGE value="修改数据获取不一致问题" />
<MESSAGE value="修改报警设备类型统计" />
<MESSAGE value="修改预案管理功能，新增预案管理数据库文档，新增设备接口文档" />
<MESSAGE value="新增维护类别" />
<MESSAGE value="修改施工数据新增删除编辑" />
<MESSAGE value="新增工器具耗材" />
<MESSAGE value="根据华锐王工反馈测试，修改接口" />
<MESSAGE value="根据华锐王工反馈测试，修改接口，新增管线类型获取，修改管线长度和仓体统计方式" />
<MESSAGE value="报警管理异常处理" />
<MESSAGE value="增加道路表" />
<option name="LAST_COMMIT_MESSAGE" value="增加道路表" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java</url>
<line>47</line>
<properties />
<option name="timeStamp" value="330" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
</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>
<caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="43" selection-start-column="43" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
<caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmLinkRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="428">
<caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="20" column="21" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</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 relative-caret-position="-176">
<caret line="15" column="26" lean-forward="true" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1430">
<caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
</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 relative-caret-position="404">
<caret line="112" column="17" selection-start-line="112" selection-start-column="17" selection-end-line="112" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="115" column="62" lean-forward="true" selection-start-line="115" selection-start-column="62" selection-end-line="115" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="35" column="41" lean-forward="true" selection-start-line="35" selection-start-column="41" selection-end-line="35" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="75" selection-start-line="75" selection-end-line="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="79" column="55" selection-start-line="79" selection-start-column="55" selection-end-line="79" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="223" column="31" lean-forward="true" selection-start-line="223" selection-start-column="31" selection-end-line="223" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.4.2/jackson-databind-2.4.2-sources.jar!/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="74">
<caret line="652" selection-start-line="652" selection-end-line="652" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="35" column="21" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="492">
<caret line="32" selection-start-line="32" selection-end-line="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="66" column="52" selection-start-line="66" selection-start-column="52" selection-end-line="66" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="204" selection-start-line="204" selection-end-line="204" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="27" column="21" lean-forward="true" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="28" column="44" lean-forward="true" selection-start-line="28" selection-start-column="44" selection-end-line="28" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<caret line="16" column="11" selection-start-line="15" selection-start-column="3" selection-end-line="16" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362">
<caret line="23" column="44" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="101" lean-forward="true" selection-start-line="101" selection-end-line="101" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
<folding>
<element signature="method#deletePartition#0;class#PgPartitionRs#0" />
<element signature="method#getPartition#0;class#PgPartitionRs#0" />
<element signature="method#getPartitionListByName#0;class#PgPartitionRs#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<caret line="23" selection-start-line="23" selection-end-line="24" selection-end-column="87" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="25" selection-start-line="25" selection-end-line="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="26" selection-start-line="26" selection-end-line="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<last-edited>PgInterface</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.27701148" />
<option value="0.5" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<last-edited>Web (PgInterface)|Web</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.27701148" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<last-edited>Python 2.7.13rc1 (C:\Python27\python.exe) interpreter library</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.27701148" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.27701148" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>Web|PgInterface</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.27701148" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>Maven: antlr:antlr:2.7.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.27701148" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
