liyg há 2 anos atrás
pai
commit
5153ae668b

+ 2 - 2
src/main/java/com/steerinfo/dil/config/ImageFileUtils.java

@@ -122,13 +122,13 @@ public class ImageFileUtils implements FileUtils {
      * @return
      * @throws Exception
      */
-    public synchronized String updateFile(MultipartFile file) throws Exception {
+    public synchronized String updateFile(MultipartFile file,long workerId) throws Exception {
         //首先通过Calendard对象获得年月日
         Calendar calendar= Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
         int month = calendar.get(Calendar.MONTH);
         int day= calendar.get(Calendar.DAY_OF_MONTH);
-        String url = UploadUtils.uploadFile(file, new IdGenerator(0, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+        String url = UploadUtils.uploadFile(file, new IdGenerator(workerId%31, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
         return url;
     }
 

+ 3 - 3
src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -84,8 +84,8 @@ public class OTMSController {
         //第一张和第二张必填
         files.add(request.getFile("file1"));
         files.add(request.getFile("file2"));
-        for(MultipartFile item:files){
-            file+=imageFileUtils.updateFile(item)+';';
+        for(int i=0;i<files.size();i++){
+            file+=imageFileUtils.updateFile(files.get(i),i)+';';
         }
         return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
     }
@@ -113,7 +113,7 @@ public class OTMSController {
         Map<String,Object> mapValue=new HashMap<>();
         for (int i=0;i<files.size();i++){
             MultipartFile file=files.get(i);
-            String url = imageFileUtils.updateFile(file);
+            String url = imageFileUtils.updateFile(file,i);
             mapValue.put("url"+i,url);
             if(i>=3) {
                 fourFiles.add(url);

+ 7 - 0
src/main/java/com/steerinfo/dil/util/test.java

@@ -1,4 +1,11 @@
 package com.steerinfo.dil.util;
 
+import com.steerinfo.framework.utils.misc.IdGenerator;
+
 public class test {
+    public static void main(String[] args) {
+        for(int i=0;i<1000;i++){
+            System.out.println(new IdGenerator(i%31,10).getNextStr());
+        }
+    }
 }