lyq 1 éve
szülő
commit
d99bcbdefd

+ 15 - 13
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTEventcatalogueController.java

@@ -319,19 +319,6 @@ public class CentereventTEventcatalogueController extends BaseController {
         EventProducerUtil.publish(eventCode, BusinessType.DELETE);
         return toAjax(result);
     }
-    @GetMapping("/upatach/{num}")
-    public AjaxResult upatach(@PathVariable int num) {
-        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
-        paramMap.put("token", RemoteApiUtil.getInstance().getToken());// 大华token
-        List<Map<String, Object>> list = centereventTEventcatalogueService.selectFailUpattah(num);
-        for (Map map:list) {
-            paramMap.put("czlx", "AI");
-            paramMap.put("busId", MapUtils.getString(map,"busId"));
-            remoteDataService.updateAttach(paramMap);
-        }
-        return AjaxResult.success();
-    }
-
 
     /**
      * 手机端调用发送短信
@@ -389,4 +376,19 @@ public class CentereventTEventcatalogueController extends BaseController {
             return AjaxResult.success(centereventTEventcatalogueService.eventhandleDownload(id));
         }
     }
+
+    @GetMapping("/upatach/{num}")
+    public AjaxResult upatach(@PathVariable int num) {
+        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
+        paramMap.put("token", RemoteApiUtil.getInstance().getToken());// 大华token
+        List<Map<String, Object>> list = centereventTEventcatalogueService.selectFailUpattah(num);
+        int i = 0;
+        for (Map map : list) {
+            paramMap.put("czlx", "AI");
+            paramMap.put("busId", MapUtils.getString(map, "busId"));
+            remoteDataService.updateAttach(paramMap);
+            i++;
+        }
+        return AjaxResult.success(i);
+    }
 }

+ 1 - 1
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/mapper/CentereventTEventcatalogueMapper.java

@@ -64,7 +64,7 @@ public interface CentereventTEventcatalogueMapper {
 
     CentereventTEventcatalogue mqtest(@Param("start") String start, @Param("end") String end, @Param("limit") int limit);
 
-    List<CentereventTEventcatalogue>  getbeforedateDownload(Map<String,Object> params);
+    List<CentereventTEventcatalogue> getbeforedateDownload(Map<String, Object> params);
 
     List<Map<String, Object>> selectFailUpattah(int num);
 }

+ 21 - 25
src/main/resources/mapper/centereventteventcatalogue/CentereventTEventcatalogueMapper.xml

@@ -376,30 +376,26 @@
     </select>
 
     <select id="selectFailUpattah" parameterType="int" resultType="map">
-SELECT
-	ch.bus_id AS busId
-FROM
-	onest_event.centerevent_t_eventcatalogue a
-	LEFT JOIN (
-	SELECT
-		SUBSTRING_INDEX( GROUP_CONCAT( id ORDER BY create_time ), ',', 1 ) id,
-		event_code
-	FROM
-		centerevent_t_fire_log
-	WHERE
-		DATEDIFF( NOW(), create_time ) >= #{num}
-	GROUP BY
-		event_code
-	) d ON a.event_code = d.event_code
-	LEFT JOIN onest_data.centerdata_t_attach ch ON ch.bus_id = d.id
-WHERE
-	ch.attach_path NOT LIKE 'group%'
-	AND a.report_source = 'reporting_source_1'
-	AND DATEDIFF( NOW(), a.report_time ) >= #{num}
-	AND a.event_status_value NOT IN (
-		'forest_event_status_3',
-		'forest_event_status_4'
-	)
-
+        SELECT
+            ch.bus_id busId
+        FROM
+            centerevent_t_eventcatalogue a
+            LEFT JOIN (
+            SELECT
+                SUBSTRING_INDEX( GROUP_CONCAT( id ORDER BY create_time ), ',', 1 ) id,
+                event_code
+            FROM
+                centerevent_t_fire_log
+            WHERE
+                DATEDIFF( NOW(), create_time ) >= #{num}
+            GROUP BY
+                event_code
+            ) d ON a.event_code = d.event_code
+            LEFT JOIN onest_data.centerdata_t_attach ch ON ch.bus_id = d.id
+        WHERE
+            ch.attach_path NOT LIKE 'group%'
+            AND a.report_source = 'reporting_source_1'
+            AND DATEDIFF( NOW(), a.report_time ) >= #{num}
+            AND a.event_status_value IN ('forest_event_status_2','forest_event_status_5','forest_event_status_6','forest_event_status_7')
     </select>
 </mapper>