11111

src/main/java/org/jeecg/common/api/vo/Result.java

@@ -27,6 +27,11 @@ public class Result<T> implements Serializable {
 	 */
 	private String message = "操作成功！";
 
+	/**
+	 * 返回附加消息
+	 */
+	private String addMes = "";
+
 	/**
 	 * 返回代码
 	 */

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -67,8 +67,10 @@ public class FbsWorkingStatisticsController {
 	 private IFbsPersonService fbsPersonService;
 	 @Value("${jeecg.path.upload}")
 	 private String upLoadPath;
-	 @Value("${jeecg.path.upvedio}")
-	 private String upVedio;
+	 @Value("${jeecg.path.upvedioAAA}")
+	 private String upVedioAAA;
+	 @Value("${jeecg.path.upvedioABB}")
+	 private String upVedioABB;
 	 @Value("${jeecg.path.uppersonnel}")
 	 private String upPersonnel;
 
@@ -697,13 +699,20 @@ public class FbsWorkingStatisticsController {
 	 public Result<List<Map<String,Object>>> getVedioFileList(){
 		 Result<List<Map<String,Object>>> result=new Result<>();
 		 ArrayList<String> list = new ArrayList<>();
-		 FileList.getAllFileName(upVedio,list);
+		 FileList.getAllFileName(upVedioAAA,list);
+		 if(list == null || list.size() < 1){
+			 FileList.getAllFileName(upVedioABB,list);
+			 result.setAddMes("ABB");
+		 }else{
+			 result.setAddMes("AAA");
+		 }
 		 List<Map<String,Object>> resuleMap = new ArrayList<>();
 		 try {
 			 Collections.sort(list); // 升序排列
 			 for (String o:list){
 				 Map<String,Object> map = new HashMap<>();
 				 map.put("fileName",o);
+				 map.put("upVideo",result.getAddMes());
 				 map.put("fileType",getFileOf(o).toLowerCase());
 				 String fileType = getFileOf(o).toLowerCase();
 				 if(fileType.equals("jpg") || fileType.equals("jpeg") || fileType.equals("png")){
@@ -715,7 +724,6 @@ public class FbsWorkingStatisticsController {
 					continue;
 				 }
 				 resuleMap.add(map);
-//				 break;
 			 }
 			 result.setResult(resuleMap);
 			 result.success("操作成功");