|
@@ -2,17 +2,8 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/util/UserPasswordR.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/java/com/sooka/web/controller/system/SysUserController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysRegisterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysRegisterService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
@@ -31,29 +22,29 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="ry.html" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/ry.html">
|
|
|
+ <file leaf-file-name="Visualization_Event_Controller.java" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="349">
|
|
|
- <caret line="109" column="89" lean-forward="true" selection-start-line="107" selection-start-column="8" selection-end-line="109" selection-end-column="89" />
|
|
|
+ <state relative-caret-position="335">
|
|
|
+ <caret line="149" column="110" selection-start-line="149" selection-start-column="110" selection-end-line="149" selection-end-column="110" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="DataScopeAspect.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/aspectj/DataScopeAspect.java">
|
|
|
+ <file leaf-file-name="event.html" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="152">
|
|
|
- <caret line="152" selection-start-line="152" selection-end-line="152" />
|
|
|
+ <state relative-caret-position="420">
|
|
|
+ <caret line="29" column="43" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="43" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="Visualization_Event_Controller.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
|
|
|
+ <file leaf-file-name="sj.js" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/js/sj.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="259">
|
|
|
- <caret line="455" lean-forward="true" selection-start-line="455" selection-end-line="455" />
|
|
|
+ <state relative-caret-position="1798">
|
|
|
+ <caret line="91" column="22" selection-start-line="91" selection-start-column="16" selection-end-line="91" selection-end-column="22" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -61,8 +52,8 @@
|
|
|
<file leaf-file-name="Visualization_Event_Service.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="142">
|
|
|
- <caret line="35" column="57" selection-start-line="35" selection-start-column="57" selection-end-line="35" selection-end-column="57" />
|
|
|
+ <state relative-caret-position="186">
|
|
|
+ <caret line="16" column="30" selection-start-line="16" selection-start-column="30" selection-end-line="16" selection-end-column="30" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -70,8 +61,8 @@
|
|
|
<file leaf-file-name="Visualization_Event_Service_Impl.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="172">
|
|
|
- <caret line="161" column="61" selection-start-line="161" selection-start-column="61" selection-end-line="161" selection-end-column="61" />
|
|
|
+ <state relative-caret-position="186">
|
|
|
+ <caret line="64" column="29" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
|
|
|
<folding>
|
|
|
<element signature="e#4169#4170#0" expanded="true" />
|
|
|
<element signature="e#4240#4241#0" expanded="true" />
|
|
@@ -100,29 +91,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="Visualization_Event_Mapper.java" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="189">
|
|
|
- <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="Visualization_Event_Mapper.xml" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="Visualization_Event_Mapper.xml" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="185">
|
|
|
- <caret line="851" column="75" lean-forward="true" selection-start-line="851" selection-start-column="75" selection-end-line="851" selection-end-column="75" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="TUEventFireServiceImpl.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="223">
|
|
|
- <caret line="90" column="7" lean-forward="true" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
|
|
|
+ <state relative-caret-position="365">
|
|
|
+ <caret line="615" column="27" selection-start-line="615" selection-start-column="27" selection-end-line="615" selection-end-column="27" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -139,15 +112,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>addFilter</find>
|
|
|
- <find>recttime</find>
|
|
|
- <find>无异常</find>
|
|
|
- <find>add</find>
|
|
|
- <find>drivingEvents</find>
|
|
|
- <find>layui-layer-btn1</find>
|
|
|
- <find>wind</find>
|
|
|
- <find>验证码</find>
|
|
|
- <find>captchaEnabled</find>
|
|
|
<find>用户登录</find>
|
|
|
<find>signupForm</find>
|
|
|
<find>login</find>
|
|
@@ -166,9 +130,18 @@
|
|
|
<find>云台总数</find>
|
|
|
<find>visualization_user_count.ZRS</find>
|
|
|
<find>getVisualization_User_Count</find>
|
|
|
- <find>visualization_users</find>
|
|
|
+ <find>森林防火</find>
|
|
|
<find>ZRS</find>
|
|
|
+ <find>防火检查站</find>
|
|
|
+ <find>jgfs</find>
|
|
|
+ <find>left_nav</find>
|
|
|
+ <find>getVisualizationEvent</find>
|
|
|
+ <find>getCheckedArray</find>
|
|
|
<find>Visualization_Camera_Count</find>
|
|
|
+ <find>Visualization_Pending_List</find>
|
|
|
+ <find>slfh</find>
|
|
|
+ <find>params</find>
|
|
|
+ <find>visualization_users</find>
|
|
|
</findStrings>
|
|
|
<dirStrings>
|
|
|
<dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
|
|
@@ -237,11 +210,11 @@
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html" />
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html" />
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java" />
|
|
|
- <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" />
|
|
|
- <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" />
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/ry.html" />
|
|
|
- <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" />
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java" />
|
|
|
+ <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" />
|
|
|
+ <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java" />
|
|
|
+ <option value="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -281,8 +254,8 @@
|
|
|
</packageJsonPaths>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="1933" />
|
|
|
- <option name="y" value="120" />
|
|
|
+ <option name="x" value="60" />
|
|
|
+ <option name="y" value="6" />
|
|
|
<option name="width" value="1936" />
|
|
|
<option name="height" value="1056" />
|
|
|
</component>
|
|
@@ -307,47 +280,37 @@
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="leiSP-system" 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="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="framework" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="leiSP-system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="framework" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="aspectj" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="system" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -511,6 +474,18 @@
|
|
|
<item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="slfh" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="event" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="hnly" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="mybusiness" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="slfh" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="event" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="domain" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
@@ -553,7 +528,7 @@
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="grid" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -562,8 +537,8 @@
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="grid" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="manager" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -573,8 +548,6 @@
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="visualization" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
@@ -722,7 +695,7 @@
|
|
|
<workItem from="1665801242192" duration="1888000" />
|
|
|
<workItem from="1665991581016" duration="6194000" />
|
|
|
<workItem from="1666053602923" duration="14423000" />
|
|
|
- <workItem from="1666139559736" duration="6044000" />
|
|
|
+ <workItem from="1666139559736" duration="9606000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="http">
|
|
|
<created>1665216030960</created>
|
|
@@ -878,14 +851,21 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1666061853129</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="23" />
|
|
|
+ <task id="LOCAL-00023" summary="http">
|
|
|
+ <created>1666159872050</created>
|
|
|
+ <option name="number" value="00023" />
|
|
|
+ <option name="presentableId" value="LOCAL-00023" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1666159872050</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="24" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="140619000" />
|
|
|
+ <option name="totallyTimeSpent" value="144181000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="1912" y="-8" width="1936" height="1096" extended-state="6" />
|
|
|
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info anchor="right" id="Palette" order="3" />
|
|
@@ -898,7 +878,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.40319148" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.28555554" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
<window_info anchor="bottom" id="Messages" order="7" weight="0.42021278" />
|
|
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
@@ -909,7 +889,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.36888888" />
|
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.195629" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.195629" />
|
|
|
<window_info anchor="right" id="Bean Validation" order="3" />
|
|
|
<window_info id="Web" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
@@ -942,50 +922,10 @@
|
|
|
<option name="timeStamp" value="41" />
|
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|
|
|
- <option name="time" value="50" />
|
|
|
+ <option name="time" value="67" />
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <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="427">
|
|
|
- <caret line="358" column="18" lean-forward="true" selection-start-line="358" selection-start-column="18" selection-end-line="358" selection-end-column="18" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-9976" />
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/service/ITResLevelService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="173">
|
|
|
- <caret line="44" column="30" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="30" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/main.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="180">
|
|
|
- <caret line="378" column="44" selection-start-line="378" selection-start-column="44" selection-end-line="378" selection-end-column="44" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/controller/TResLevelController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="105" column="38" selection-start-line="105" selection-start-column="38" selection-end-line="105" selection-end-column="38" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/levelmanager/domain/TResLevel.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="383">
|
|
|
- <caret line="126" column="37" lean-forward="true" selection-start-line="126" selection-start-column="37" selection-end-line="126" selection-end-column="37" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResLevelMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="300">
|
|
@@ -1102,13 +1042,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-911">
|
|
|
- <caret line="30" column="28" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="28" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="217">
|
|
@@ -1216,13 +1149,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="223">
|
|
|
- <caret line="90" column="7" lean-forward="true" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/frame.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="181">
|
|
@@ -1237,45 +1163,80 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/ry.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="142">
|
|
|
- <caret line="35" column="57" selection-start-line="35" selection-start-column="57" selection-end-line="35" selection-end-column="57" />
|
|
|
+ <state relative-caret-position="349">
|
|
|
+ <caret line="109" column="89" lean-forward="true" selection-start-line="107" selection-start-column="8" selection-end-line="109" selection-end-column="89" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/aspectj/DataScopeAspect.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="185">
|
|
|
- <caret line="851" column="75" lean-forward="true" selection-start-line="851" selection-start-column="75" selection-end-line="851" selection-end-column="75" />
|
|
|
+ <state relative-caret-position="152">
|
|
|
+ <caret line="152" selection-start-line="152" selection-end-line="152" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="259">
|
|
|
- <caret line="455" lean-forward="true" selection-start-line="455" selection-end-line="455" />
|
|
|
+ <state relative-caret-position="189">
|
|
|
+ <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/ry.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="349">
|
|
|
- <caret line="109" column="89" lean-forward="true" selection-start-line="107" selection-start-column="8" selection-end-line="109" selection-end-column="89" />
|
|
|
+ <state relative-caret-position="-141">
|
|
|
+ <caret line="21" column="46" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/aspectj/DataScopeAspect.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/static/visualization/js/sj.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="152">
|
|
|
- <caret line="152" selection-start-line="152" selection-end-line="152" />
|
|
|
+ <state relative-caret-position="1798">
|
|
|
+ <caret line="91" column="22" selection-start-line="91" selection-start-column="16" selection-end-line="91" selection-end-column="22" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/event.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="420">
|
|
|
+ <caret line="29" column="43" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="43" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/domain/Visualization_Event.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="180">
|
|
|
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="186">
|
|
|
+ <caret line="16" column="30" selection-start-line="16" selection-start-column="30" selection-end-line="16" selection-end-column="30" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="335">
|
|
|
+ <caret line="149" column="110" selection-start-line="149" selection-start-column="110" selection-end-line="149" selection-end-column="110" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="223">
|
|
|
+ <caret line="90" column="7" lean-forward="true" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="172">
|
|
|
- <caret line="161" column="61" selection-start-line="161" selection-start-column="61" selection-end-line="161" selection-end-column="61" />
|
|
|
+ <state relative-caret-position="186">
|
|
|
+ <caret line="64" column="29" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
|
|
|
<folding>
|
|
|
<element signature="e#4169#4170#0" expanded="true" />
|
|
|
<element signature="e#4240#4241#0" expanded="true" />
|
|
@@ -1303,10 +1264,25 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TBusDevicerepairMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TUFirereportMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="189">
|
|
|
- <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
|
|
|
+ <state relative-caret-position="-8010" />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/leiSP-system/src/main/resources/mapper/system/SysUserMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="450">
|
|
|
+ <caret line="126" column="27" lean-forward="true" selection-start-line="125" selection-start-column="8" selection-end-line="126" selection-end-column="27" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="365">
|
|
|
+ <caret line="615" column="27" selection-start-line="615" selection-start-column="27" selection-end-line="615" selection-end-column="27" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|