|
@@ -3,8 +3,6 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
@@ -23,20 +21,11 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="demo-dsd.html" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/demo-dsd.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="300">
|
|
|
- <caret line="220" column="19" selection-start-line="220" selection-start-column="19" selection-end-line="220" selection-end-column="19" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file leaf-file-name="DaHuaMessageServiceImpl.java" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="140">
|
|
|
- <caret line="397" column="27" selection-start-line="397" selection-start-column="27" selection-end-line="397" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="401" column="16" selection-start-line="401" selection-start-column="16" selection-end-line="401" selection-end-column="16" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -162,6 +151,8 @@
|
|
|
<find>openDetailsDia</find>
|
|
|
<find>getVisualizationDetails</find>
|
|
|
<find>selectTResCameraByCameraId$</find>
|
|
|
+ <find>itResAttachService</find>
|
|
|
+ <find>http://122.141.177.214:9090/dahua/demo-jkd.html</find>
|
|
|
</findStrings>
|
|
|
<dirStrings>
|
|
|
<dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
|
|
@@ -257,10 +248,10 @@
|
|
|
</packageJsonPaths>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="-8" />
|
|
|
- <option name="y" value="-8" />
|
|
|
- <option name="width" value="1936" />
|
|
|
- <option name="height" value="1056" />
|
|
|
+ <option name="x" value="-79" />
|
|
|
+ <option name="y" value="59" />
|
|
|
+ <option name="width" value="1920" />
|
|
|
+ <option name="height" value="1040" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
@@ -502,7 +493,7 @@
|
|
|
<workItem from="1665359355827" duration="7320000" />
|
|
|
<workItem from="1665370196293" duration="24127000" />
|
|
|
<workItem from="1665447580649" duration="15844000" />
|
|
|
- <workItem from="1665533158898" duration="6908000" />
|
|
|
+ <workItem from="1665533158898" duration="8943000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="http">
|
|
|
<created>1665216030960</created>
|
|
@@ -574,11 +565,25 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1665541373365</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="11" />
|
|
|
+ <task id="LOCAL-00011" summary="http">
|
|
|
+ <created>1665542687992</created>
|
|
|
+ <option name="number" value="00011" />
|
|
|
+ <option name="presentableId" value="LOCAL-00011" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1665542687992</updated>
|
|
|
+ </task>
|
|
|
+ <task id="LOCAL-00012" summary="http">
|
|
|
+ <created>1665545712320</created>
|
|
|
+ <option name="number" value="00012" />
|
|
|
+ <option name="presentableId" value="LOCAL-00012" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1665545712320</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="13" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="70056000" />
|
|
|
+ <option name="totallyTimeSpent" value="72091000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -593,7 +598,7 @@
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
<window_info id="UI Designer" order="2" />
|
|
|
- <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.44444445" />
|
|
|
+ <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.6022222" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
<window_info anchor="bottom" id="Messages" order="7" weight="0.46666667" />
|
|
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
@@ -603,7 +608,7 @@
|
|
|
<window_info anchor="bottom" id="Version Control" order="7" />
|
|
|
<window_info anchor="bottom" id="Run" order="2" weight="0.52666664" />
|
|
|
<window_info anchor="bottom" id="Spring" order="7" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="7" weight="0.32" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.44042554" />
|
|
|
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17803837" />
|
|
|
<window_info anchor="right" id="Bean Validation" order="3" />
|
|
|
<window_info id="Web" order="2" side_tool="true" />
|
|
@@ -860,13 +865,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/bin/package.bat">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="11" column="5" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="193">
|
|
@@ -990,10 +988,17 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/bin/package.bat">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="330">
|
|
|
+ <caret line="11" column="5" lean-forward="true" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="140">
|
|
|
- <caret line="397" column="27" selection-start-line="397" selection-start-column="27" selection-end-line="397" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="401" column="16" selection-start-line="401" selection-start-column="16" selection-end-line="401" selection-end-column="16" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|