Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -860,6 +860,39 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.findDetailsForStatement(map);
     }
 
+    @PostMapping("updateTruckDetail")
+    @ApiOperation(value = "直接修改汽运详单")
+    RESTfulResult updateTruckDetail(@RequestParam("orderList")BigDecimal[] orderList,@RequestParam("detailRemark") String detailRemark,@RequestParam("detailAmount") BigDecimal detailAmount,@RequestParam("userId") BigDecimal userId, MultipartRequest request) {
+        String url="";
+        List<MultipartFile> files = new ArrayList<>();
+        //获取图片
+        for(int i=0;i<=10;i++){
+            MultipartFile temp = request.getFile("file"+i);
+            if(temp!=null){
+                files.add(temp);
+            }
+        }
+        if(files.size() < 1){
+            return failed("没有上传图片！");
+        }
+        //上传图片
+        try{
+            for(int i=0;i<files.size();i++){
+                url+=imageFileUtils.updateFile(files.get(i),i)+';';
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("上传图片失败！");
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("orderList",orderList);
+        map.put("detailAmount",detailAmount);
+        map.put("detailRemark",detailRemark);
+        map.put("url",url);
+        map.put("userId",userId);
+        return bmstruckFeign.updateTruckDetail(map);
+    }
+
     @ApiOperation("查询发票图片")
     @PostMapping("/getStatementPhoto")
     public List<String> getStatementPhoto(@RequestParam BigDecimal statementId) throws Exception{

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.config.ImageFileUtils;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.impl.UniversalServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -49,6 +50,9 @@ public class UniversalController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    @Autowired
+    private ImageFileUtils imageFileUtils;
+
 
     @ApiOperation(value="查询数据打印提货单接口")
     @ApiImplicitParams({
@@ -1162,4 +1166,16 @@ public class UniversalController extends BaseRESTfulController {
     public List<String> getColumnNoRoutList(@RequestBody(required = false) Map<String,Object> map) {
         return universalMapper.getColumnNoRoutList(map);
     }
+
+    @ApiOperation("获取图片通用方法")
+    @PostMapping("/getPicture")
+    public List<String> getPicture(@RequestBody(required = false) Map<String,Object> map) throws Exception {
+        List<String> results=new ArrayList<>();
+        String urls = map.get("urls").toString();
+        String files[]=urls.split(";");
+        for(int i=0;i<files.length && files[i].length()>5;i++){
+            results.add((String)imageFileUtils.downloadFile(files[i]));
+        }
+        return results;
+    }
 }

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

@@ -132,6 +132,14 @@ public interface BmstruckFeign {
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
     RESTfulResult addTruckStatement(@RequestBody Map<String, Object> map);
 
+    /**
+     * 直接修改汽运计费详单
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateTruckDetail")
+    RESTfulResult updateTruckDetail(@RequestBody Map<String, Object> map);
+
     /**
      * 展示账单下的详单
      *