袁少华 4 年之前
父節點
當前提交
9e92dd743e

+ 50 - 4
src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -69,6 +69,8 @@ public class FbsWorkingStatisticsController {
 	 private String upLoadPath;
 	 @Value("${jeecg.path.upvedio}")
 	 private String upVedio;
+	 @Value("${jeecg.path.uppersonnel}")
+	 private String upPersonnel;
 
 	 public static void main1(String[] srg) {
 		 String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -651,6 +653,11 @@ public class FbsWorkingStatisticsController {
 		return result;
 	}
 
+	 /**
+	  * esop文件获取
+	  * @param code
+	  * @return
+	  */
 	 @RequestMapping(value = "getEsopFileList")
 	 public Result<List<Map<String,Object>>> getEsopFileList(String code){
 		 Result<List<Map<String,Object>>> result=new Result<>();
@@ -682,6 +689,10 @@ public class FbsWorkingStatisticsController {
 		 return result;
 	 }
 
+	 /**
+	  * 空白看板文件获取
+	  * @return
+	  */
 	 @RequestMapping(value = "getVedioFileList")
 	 public Result<List<Map<String,Object>>> getVedioFileList(){
 		 Result<List<Map<String,Object>>> result=new Result<>();
@@ -717,12 +728,47 @@ public class FbsWorkingStatisticsController {
 		 return result;
 	 }
 
-
 	 /**
-	  * 获取文件后缀名
-	  * @param fileName
-	  * @return
+	  * 获取仓库人员图片信息
 	  */
+	 @RequestMapping(value = "/getFilePersonList")
+	 public Result<List<Map<String,Object>>> getFilePersonList(String code){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 ArrayList<String> list = new ArrayList<>();
+		 String par = FileList.getAllFileName(upPersonnel+code,list);
+
+		 if(par.equals("false")){
+			 result.error500("文件为空");
+			 return result;
+		 }
+
+		 List<Map<String,Object>> resuleMap = new ArrayList<>();
+		 try {
+
+			 for (String o:list){
+				 Map<String,Object> map = new HashMap<>();
+				 map.put("fileName",o);
+				 map.put("fileRealName",getFileBefore(o).toLowerCase());
+				 map.put("fileType",getFileOf(o).toLowerCase());
+				 resuleMap.add(map);
+			 }
+			 result.setResult(resuleMap);
+			 result.success("操作成功");
+
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败:"+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
+
+	 /**
+          * 获取文件后缀名
+          * @param fileName
+          * @return
+          */
 	 public String getFileOf(String fileName) {
 		 String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
 		 return suffix;

+ 3 - 1
src/main/resources/application-prod.yml

@@ -128,7 +128,9 @@ mybatis-plus:
 jeecg :
   path :
     #文件上传根目录 设置
-    upload: D://upFiles
+    upload: D://VsCodeWork/FBS_VIEW/upFiles/
+    upvedio: D://VsCodeWork/FBS_VIEW/upVedio
+    uppersonnel: D://VsCodeWork/FBS_VIEW/upPersonnel/
     #webapp文件路径
     webapp: D://webapp
 logging: