|
|
@@ -81,19 +81,37 @@ public class OTMSController {
|
|
|
//添加到files数组
|
|
|
List<MultipartFile> files = new ArrayList<>();
|
|
|
String file="";
|
|
|
+ int index=0;
|
|
|
//第一张和第二张必填
|
|
|
for(int i=1;i<=2;i++){
|
|
|
MultipartFile temp = request.getFile("file"+i);
|
|
|
if(temp!=null){
|
|
|
files.add(temp);
|
|
|
+ index=i;//记录是新上传了第一张还是第二张图片
|
|
|
}
|
|
|
}
|
|
|
- if(files.size()<2){
|
|
|
+ //没有上传，当做重复上传
|
|
|
+ if(files.size() == 0){
|
|
|
return new RESTfulResult("201","若要重复上传，必须两张都是新图片！","请勿重复上传！");
|
|
|
}
|
|
|
+ //上传图片
|
|
|
for(int i=0;i<files.size();i++){
|
|
|
file+=imageFileUtils.updateFile(files.get(i),i)+';';
|
|
|
}
|
|
|
+ //只上传了一张图片，补足另一张
|
|
|
+ if(files.size() == 1){
|
|
|
+ try{
|
|
|
+ String arrivalPhoto=otmsFeign.getArrivalPhoto(orderNumber);
|
|
|
+ String[] olds=arrivalPhoto.split(";");
|
|
|
+ if(index==1){
|
|
|
+ file=file+olds[1]+";";
|
|
|
+ }else if(index==2){
|
|
|
+ file=olds[0]+";"+file;
|
|
|
+ }
|
|
|
+ }catch (Exception e){
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
return otmsFeign.addtmstruckArrivalResult(orderNumber,resultArrivalAddress,file);
|
|
|
}
|
|
|
|
