Merge remote-tracking branch 'origin/master'

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;
     }
 

src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -75,12 +75,22 @@ public class OTMSController {
         return otmsFeign.getFinishTruckOrderInfo(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
 
-    @ApiOperation(value = "获得抵达实集")
+    @ApiOperation(value = "新增抵达")
     @PostMapping(value = "/addtmstruckArrivalResult")
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartFile file){
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress, MultipartRequest request) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        String file="";
+        //第一张和第二张必填
+        files.add(request.getFile("file1"));
+        files.add(request.getFile("file2"));
+        for(int i=0;i<files.size();i++){
+            file+=imageFileUtils.updateFile(files.get(i),i)+';';
+        }
         return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
     }
 
+    @ApiOperation(value = "新增签收")
     @PostMapping(value = "/addTmstruckReceiptResult")
     public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
         //添加到files数组
@@ -103,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);
@@ -161,8 +171,19 @@ public class OTMSController {
 
     @ApiOperation("展示满货箱的照片")
     @PostMapping("/getArrivalPhoto")
-    public String getArrivalPhoto(@RequestParam String orderNumber){
-        return otmsFeign.getArrivalPhoto(orderNumber);
+    public List<String> getArrivalPhoto(@RequestParam String orderNumber) throws Exception{
+        try{
+            String arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber);
+            String files[]=arrivalPhoto.split(";");
+            List<String> file=new ArrayList<>();
+            for(int i=0;i<files.length&& files[i].length()>5;i++){
+                file.add((String)imageFileUtils.downloadFile(files[i]));
+            }
+            return file;
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
     }
 
     @ApiOperation("厂外抵达作业")

src/main/java/com/steerinfo/dil/feign/OtmsFeign.java

@@ -74,8 +74,8 @@ public interface OtmsFeign {
     public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
 
     //获得抵达实集
-    @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestPart("file") MultipartFile file);
+    @PostMapping(value = "/api/v1/otms/tmstruckarrivalresults/addtmstruckArrivalResult")
+    public RESTfulResult addtmstruckArrivalResult(@RequestParam("orderNumber")String orderNumber, @RequestParam("resultArrivalAddress")String resultArrivalAddress,@RequestParam("file") String file);
 
     //添加签收图片
     @PostMapping(value = "/api/v1/otms/pathDisplay/addTmstruckReceiptResult")

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());
+        }
+    }
 }