From af23f1cb89b1845964dda1869baac2e3c9adf862 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 9 May 2024 22:22:21 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B45=E6=9C=889=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9B=B4=E6=92=AD=E7=94=BB=E9=9D=A2=E6=8A=93=E5=8F=96?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/KcDetectionDetailedServiceImpl.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/service/impl/KcDetectionDetailedServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/service/impl/KcDetectionDetailedServiceImpl.java
index f0c99e2e..df028e72 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/service/impl/KcDetectionDetailedServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/detection/service/impl/KcDetectionDetailedServiceImpl.java
@@ -76,8 +76,10 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl<KcDetectionDetai
 
 	@Override
 	public void videoScreenshotAll() {
-		DateTime starTime = DateTime.now();
-		String nowStr = starTime.toString("yyyy-MM-dd");
+		DateTime now = DateTime.now();
+		String nowStr = now.toString("yyyy-MM-dd");
+
+		String yearMonthStr = now.toString("yyyy-MM");
 
 		//新版，查询当前是否有课
 //		KcZhihuijiaoshi jiaoshi = new KcZhihuijiaoshi();
@@ -134,11 +136,12 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl<KcDetectionDetai
 
 			zhihuijiaoshiList.forEach(x -> {
 				KcKetangbiao ketangbiao = KcKetangbiaoMap.get(x.getJsbh());
+				String rwbh = ketangbiao.getRwbh();
 
 				String fileName;
 				File uploadpathFile = new File(uploadpath);
 				String uploadpathFilePath = uploadpathFile.getPath();
-				File file = new File(uploadpathFilePath + File.separator + "videoScreenshot" + File.separator + DateUtils.getTradeNo() + File.separator);
+				File file = new File(uploadpathFilePath + File.separator + "videoScreenshot" + File.separator + ketangbiao.getXnxq() + File.separator + yearMonthStr + File.separator + x.getJsbh() + File.separator);
 				String orgName = x.getPullUrl();// 获取文件名
 				orgName = CommonUtil.getFileName(orgName);
 				if(orgName.lastIndexOf(".")!=-1){
@@ -146,11 +149,12 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl<KcDetectionDetai
 					orgName = URLEncoder.DEFAULT.encode(orgName);
 					//原名是m3u8，不是图片，改成jpeg
 //					fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + DateUtils.getTradeNo() + orgName.substring(orgName.lastIndexOf("."));
-					fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + DateUtils.getTradeNo() + ".jpeg";
+					fileName = DateUtils.getTradeNo()  + "_" + orgName.substring(0, orgName.lastIndexOf(".")) + ".jpeg";
 				}else{
 //					fileName = x.getRw"_" + orgName+ "_" + DateUtils.getTradeNo();
-					fileName = orgName+ "_" + DateUtils.getTradeNo();
+					fileName = DateUtils.getTradeNo()  + "_" + orgName;
 				}
+				fileName = rwbh + "_" + fileName;
 				//qn更改-- 修复特殊字符上传后无法下载的问题，修复多个.名称错乱的问题END
 //				String savePath = file.getPath() + File.separator + fileName;
 //				File savefile = new File(savePath);
@@ -159,7 +163,7 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl<KcDetectionDetai
 				//截图
 				String outImagePath = file.getPath() + File.separator + fileName;
 				FileUtil.touch(outImagePath);
-				String miniOutImagePath = StringUtils.replace(outImagePath, uploadpathFilePath, "");
+				String miniOutImagePath = StringUtils.replace(outImagePath, uploadpathFilePath + File.separator, "");
 				miniOutImagePath = StringUtils.replace(miniOutImagePath,"\\","/");
 				boolean isSuccess = _FFmpegTools.videoScreenshot(x.getPullUrl(), outImagePath);
 				//查找主表，
@@ -194,7 +198,7 @@ public class KcDetectionDetailedServiceImpl extends ServiceImpl<KcDetectionDetai
 				detectionDetailed.setXnxq(ketangbiao.getXnxq());
 				detectionDetailed.setDetectionUrl(x.getPullUrl());
 				detectionDetailed.setDetectionOutImgUrl(miniOutImagePath);
-				detectionDetailed.setDetectionOutImgRes("{\"res\":\"无法截取图片！\"}");
+				detectionDetailed.setDetectionOutImgRes("{\"log_id\": \"没有图片，无法查询\", \"person_num\": 0}");//
 				detectionDetailed.setDetectionNum(detectionNum);//截图序列号
 				detectionDetailed.setNum(0);