From 816ba1e56476f0e23f51711aae4b34507a04a59c Mon Sep 17 00:00:00 2001
From: admin <liwen611>
Date: 星期一, 27 五月 2024 15:18:33 +0800
Subject: [PATCH] 解决上传日期问题
---
ruoyi-admin/src/main/java/com/ruoyi/task/CameraAssembleUtil.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/CameraAssembleUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/task/CameraAssembleUtil.java
index 1b23241..66d41ee 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/task/CameraAssembleUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/task/CameraAssembleUtil.java
@@ -2,13 +2,17 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mashape.unirest.http.HttpResponse;
import com.mashape.unirest.http.Unirest;
import com.mashape.unirest.http.exceptions.UnirestException;
+import com.ruoyi.aibrain.domain.AiAlarmInfo;
import com.ruoyi.aibrain.domain.AiCamera;
+import com.ruoyi.aibrain.service.IAiAlarmInfoService;
import com.ruoyi.aibrain.service.IAiCameraService;
import com.ruoyi.camera.domain.CameraShipingsb;
import com.ruoyi.camera.service.ICameraShipingsbService;
+import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -35,6 +39,7 @@
private static IAiCameraService aiCameraService;
private static ICameraShipingsbService cameraShipingsbService;
private static ITbDataSendRecordsService tbDataSendRecordsService;
+ private static IAiAlarmInfoService aiAlarmInfoService;
private static RedisCache redisCache;
private static String SJURL="https://192.168.100.89:4200/spjr000/api/open/v1"; //鐪佺骇璇锋眰鍦板潃
@@ -55,6 +60,7 @@
aiCameraService = SpringUtils.getBean(IAiCameraService.class);
cameraShipingsbService = SpringUtils.getBean(ICameraShipingsbService.class);
tbDataSendRecordsService = SpringUtils.getBean(ITbDataSendRecordsService.class);
+ aiAlarmInfoService = SpringUtils.getBean(IAiAlarmInfoService.class);
redisCache = SpringUtils.getBean(RedisCache.class);
}
@@ -77,7 +83,7 @@
//6.椹ご闂ㄧ綈绗兼憞鍙扮姸鎬佽瘑鍒俊鎭�
//7.鎽勫儚澶撮伄鎸°�佹尓鍔ㄨ搴﹁瘑鍒俊鎭�
public static void cameraAiError() throws ParseException {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
//鏌ヨ鍑烘墍浠ユ湭浼犺緭鐨勬姤璀�
Collection<String> keys = redisCache.keys("video_*");
for (String key : keys) {
@@ -101,6 +107,24 @@
cameraShipingsb.setFileUrl(errObj.getString("recordFileName"));//璇嗗埆瑙嗛瀛樺偍鍦板潃
cameraShipingsb.setShuJuSJ(warningTime);//鏁版嵁鏃堕棿
cameraShipingsbService.insertCameraShipingsb(cameraShipingsb);
+
+
+ //鐢熸垚鎶ヨ淇℃伅
+ AiAlarmInfo aiAlarmInfo=new AiAlarmInfo();
+ aiAlarmInfo.setCameraId(aiCamera.getId());//鎶ヨ璁惧id
+ aiAlarmInfo.setCameraName(aiCamera.getName());//鎶ヨ璁惧
+ aiAlarmInfo.setRegion(aiCamera.getRegion());//鎶ヨ鍖哄煙
+ aiAlarmInfo.setRegionName(aiCamera.getRegionName());//鍖哄煙鍚嶇О
+ aiAlarmInfo.setRuleId(1L);//绠楁硶
+ aiAlarmInfo.setRegionName(shiBieLXMC+"-AI鏅鸿兘鍒嗘瀽");//绠楁硶鍚嶇О
+ aiAlarmInfo.setContent(shiBieLXMC);//鎶ヨ鍐呭
+ aiAlarmInfo.setSmallClass("1");//鎶ヨ绫诲瀷
+ aiAlarmInfo.setVideo(errObj.getString("recordFileName").replaceAll("D:/AI/aibrain/","/profile/"));//鎶ヨ瑙嗛
+ aiAlarmInfo.setPicture(errObj.getString("recordImgFileName").replaceAll("D:/AI/aibrain/","/profile/"));//鎶ヨ鍥剧墖
+ aiAlarmInfo.setAlarmTime(warningTime);//鎶ヨ鏃堕棿
+ aiAlarmInfo.setDealWith("0");//鏄惁澶勭悊锛�0鏈鐞嗭紝1宸插鐞嗭級
+ aiAlarmInfoService.insertAiAlarmInfo(aiAlarmInfo);
+
JSONObject objCS=new JSONObject();
objCS.put("type","AI鍒嗘瀽");
@@ -335,10 +359,14 @@
.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0])
.hostnameVerifier((hostname, session) -> true) // 淇′换鎵�鏈変富鏈哄悕
.build();
- String fileUrl=paramJson.getString("file");
+ String fileUrlQ=paramJson.getString("file");
+ String fileUrl=fileUrlQ.replaceAll("/","\\\\");
File file = new File(fileUrl);
- //fileUrl.split("\\");
+
+ //fileUrl.split("\\");SSS
String[] fileName=fileUrl.split("\\\\");
+
+ String fileNameQ=fileName[fileName.length-1];
RequestBody body = new MultipartBody.Builder()
.setType(MultipartBody.FORM)
@@ -349,7 +377,7 @@
.addFormDataPart("pdt", params.get("pdt"))
.addFormDataPart("data", params.get("data"))
- .addFormDataPart("file", fileName[fileName.length-1],
+ .addFormDataPart("file", fileNameQ,
RequestBody.create(MediaType.parse("application/octet-stream"),
file))
.build();
--
Gitblit v1.8.0