处理PC端上传的图片本身带后缀的情况

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -481,9 +481,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         JSONArray array = JSONArray.parseArray(picStr.replaceAll("@", ","));
                         List<String> picList = new ArrayList<>();
                         for (int i=0;i<array.size(); i++) {
-                            String string = array.getString(i);
-                            string = "/upload/" + string + ".jpg";
-                            picList.add(string);
+                            String picName = array.getString(i);
+                            if (!picName.contains(".")) {
+                                picName += ".jpg";
+                            }
+                            picList.add("/upload/" + picName);
                         }
                         report.put("pics", picList);
                     }
@@ -565,7 +567,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     JSONArray array = JSONArray.parseArray(r.getPicStr().replaceAll("@", ","));
                     List<String> list = new ArrayList<>();
                     for (int i=0;i<array.size(); i++) {
-                        list.add("/upload/"+array.getString(i)+".jpg");
+                        String picName = array.getString(i);
+                        if (!picName.contains(".")) {
+                            picName += ".jpg";
+                        }
+                        list.add("/upload/"+picName);
                     }
                     r.setPics(list);
                 }
@@ -1235,9 +1241,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         JSONArray array = JSONArray.parseArray(picStr.replaceAll("@", ","));
                         List<String> picList = new ArrayList<>();
                         for (int i=0;i<array.size(); i++) {
-                            String string = array.getString(i);
-                            string = "/upload/" + string + ".jpg";
-                            picList.add(string);
+                            String picName = array.getString(i);
+                            if (!picName.contains(".")) {
+                                picName += ".jpg";
+                            }
+                            picList.add("/upload/" + picName);
                         }
                         report.put("pics", picList);
                     }
@@ -3390,9 +3398,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         JSONArray array = JSONArray.parseArray(picStr.replaceAll("@", ","));
                         List<String> picList = new ArrayList<>();
                         for (int i=0;i<array.size(); i++) {
-                            String string = array.getString(i);
-                            string = "/upload/" + string + ".jpg";
-                            picList.add(string);
+                            String picName = array.getString(i);
+                            if (!picName.contains(".")) {
+                                picName += ".jpg";
+                            }
+                            picList.add("/upload/" + picName);
                         }
                         report.put("pics", picList);
                     }
@@ -3486,9 +3496,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         JSONArray array = JSONArray.parseArray(picStr.replaceAll("@", ","));
                         List<String> picList = new ArrayList<>();
                         for (int i=0;i<array.size(); i++) {
-                            String string = array.getString(i);
-                            string = "/upload/" + string + ".jpg";
-                            picList.add(string);
+                            String picName = array.getString(i);
+                            if (!picName.contains(".")) {
+                                picName += ".jpg";
+                            }
+                            picList.add("/upload/" + picName);
                         }
                         report.put("pics", picList);
                     }