修改

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

@@ -23,8 +23,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
 
 
+import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -1170,13 +1173,41 @@ public class UniversalController extends BaseRESTfulController {
     @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]));
+        try{
+            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;
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @ApiOperation("上传图片通用方法,返回成功后的url")
+    @PostMapping("/uploadPic")
+    public String getPicture(MultipartRequest request) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+            }
+        }
+        //没有上传
+        if(files.size() == 0){
+            return  null;
+        }
+        //上传图片,拼接在一个url里
+        String url="";
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
         }
-        return results;
+        return url;
     }
 
     @ApiOperation("销售钢材报表通用提交按钮")

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -285,4 +285,6 @@ public interface UniversalMapper {
     Map<String, Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
 
     int updateRemark(Map<String, Object> map);
+
+    int updateRemarkPic(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -339,6 +339,10 @@ public class UniversalServiceImpl implements UniversalService {
             universalMapper.updateRemark(map);
             responseMapList.add("修改备注成功");
         }
+        if(map.get("orderId") != null && map.get("urls") != null && !map.get("urls").equals(oldMes.get("urls"))) {
+            universalMapper.updateRemarkPic(map);
+            responseMapList.add("修改备注图片成功");
+        }
         //修改司机电话号码
         if(map.get("capacityTel") != null && !map.get("capacityTel").equals(oldMes.get("capacityTel"))) {
             Map<String, Object> updateDriverTelMap = new HashMap<>();

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1535,6 +1535,7 @@
                         NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                         OO.ORDER_STATUS              "carStatus",
                         OO.REMARK "remark",
+                        OO.URL "urls",
                         DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                2,'销售已提交',
                                4,'财务已审批',
@@ -1580,4 +1581,9 @@
         SET REMARK = #{remark}
         WHERE ORDER_ID = #{orderId}
     </update>
+    <update id="updateRemarkPic">
+        UPDATE OMSTRUCK_ORDER
+        SET URL = #{urls}
+        WHERE ORDER_ID = #{orderId}
+    </update>
 </mapper>