http

.idea/workspace.xml

@@ -4,9 +4,7 @@
     <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/manager/cameramanager/mapper/TResCameraMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/manager/cameramanager/mapper/TResCameraMapper.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" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/mapper/grid/manager/TResCameraMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -28,8 +26,8 @@
       <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="30">
-              <caret line="211" column="19" selection-start-line="211" selection-start-column="19" selection-end-line="211" selection-end-column="19" />
+            <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>
@@ -37,8 +35,8 @@
       <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="344">
-              <caret line="384" column="32" lean-forward="true" selection-start-line="384" selection-start-column="32" selection-end-line="384" selection-end-column="32" />
+            <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>
           </provider>
         </entry>
@@ -65,8 +63,8 @@
       <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="215">
-              <caret line="189" selection-start-line="189" selection-end-line="189" />
+            <state relative-caret-position="328">
+              <caret line="188" column="24" selection-start-line="188" selection-start-column="24" selection-end-line="188" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -161,9 +159,9 @@
       <find>getTResCameraByCameraCode</find>
       <find>selectTResCameraByCameraId</find>
       <find>selectTResCameraVo</find>
-      <find>selectTResCameraByCameraId$</find>
       <find>openDetailsDia</find>
       <find>getVisualizationDetails</find>
+      <find>selectTResCameraByCameraId$</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -504,7 +502,7 @@
       <workItem from="1665359355827" duration="7320000" />
       <workItem from="1665370196293" duration="24127000" />
       <workItem from="1665447580649" duration="15844000" />
-      <workItem from="1665533158898" duration="5434000" />
+      <workItem from="1665533158898" duration="6908000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -569,15 +567,21 @@
       <option name="project" value="LOCAL" />
       <updated>1665479560829</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="http">
+      <created>1665541373365</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1665541373365</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="68582000" />
+    <option name="totallyTimeSpent" value="70056000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -589,7 +593,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.34777778" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.44444445" />
       <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&#9;" order="3" />
@@ -625,15 +629,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java</url>
-          <line>187</line>
-          <properties />
-          <option name="timeStamp" value="13" />
-        </line-breakpoint>
-      </breakpoints>
-      <option name="time" value="15" />
+      <option name="time" value="17" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
@@ -923,8 +919,8 @@
     </entry>
     <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="30">
-          <caret line="211" column="19" selection-start-line="211" selection-start-column="19" selection-end-line="211" selection-end-column="19" />
+        <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>
@@ -989,15 +985,15 @@
     </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="215">
-          <caret line="189" selection-start-line="189" selection-end-line="189" />
+        <state relative-caret-position="328">
+          <caret line="188" column="24" selection-start-line="188" selection-start-column="24" selection-end-line="188" selection-end-column="24" />
         </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="344">
-          <caret line="384" column="32" lean-forward="true" selection-start-line="384" selection-start-column="32" selection-end-line="384" selection-end-column="32" />
+        <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>
       </provider>
     </entry>

mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java

@@ -304,8 +304,8 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
         Date alarmDate = new Date(infoJson.getLong("alarmDate") * 1000L);
 
         JSONArray pictures = JSON.parseArray(alarmPicture);
-        String alarmPictures[] =new String[pictures.size()];
-        for(int i=0;i<alarmPictures.length;i++){
+        String alarmPictures[] = new String[pictures.size()];
+        for (int i = 0; i < alarmPictures.length; i++) {
             alarmPictures[i] = pictures.get(i).toString();
         }
 
@@ -388,11 +388,11 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
             }
 
             saveFire(tUEventFire, null);
-            TResAttach tResAttach = new TResAttach();
-            tResAttach.setId(UUID.fastUUID().toString());
-            tResAttach.setBusId(eid);
-            tResAttach.setResUrl(alarmPictures[1]);
-            itResAttachService.insertTResAttach(tResAttach);
+//            TResAttach tResAttach = new TResAttach();
+//            tResAttach.setId(UUID.fastUUID().toString());
+//            tResAttach.setBusId(eid);
+//            tResAttach.setResUrl(alarmPictures[1]);
+//            itResAttachService.insertTResAttach(tResAttach);
 
 
 //默认一个处理过程 - 孙一石 2021-11-08
@@ -418,7 +418,7 @@ public class DaHuaMessageServiceImpl implements IDahuaMessageService {
             TResAttach att = new TResAttach();
             att.setId(UUID.fastUUID().toString());
             att.setBusId(processid);
-            att.setResUrl(alarmPictures[0]);
+            att.setResUrl(alarmPictures[1]);
             itResAttachService.insertTResAttach(att);
 
 

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -212,7 +212,7 @@ public class Visualization_Event_Controller extends AppBaseController {
                 String url = http_basepath+s.getRES_URL();
                 s.setRES_URL(url);
             }else{
-                s.setRES_URL("http://122.141.177.142/alarm/"+s.getRES_URL());
+                s.setRES_URL("https://119.52.253.110:4430/alarm/"+s.getRES_URL());
             }
 
         }