Skip to content

D
data-acquisition
Commit 49c7ebc4 authored by renchao's avatar renchao
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

parents b89b3e5a 62a48b0e
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 7 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java
View file @ 49c7ebc4
...@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -79,11 +80,15 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa ...@@ -79,11 +80,15 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
BeanUtils.copyProperties(query, safeTrouble); BeanUtils.copyProperties(query, safeTrouble);
safeTroubleMapper.insert(safeTrouble); safeTroubleMapper.insert(safeTrouble);
Boolean ret = ServletFileUpload.isMultipartContent(request);
//保存隐患图片 变量名称只能用file 不能修改 //保存隐患图片 变量名称只能用file 不能修改
List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("file"); if(ret){
if (photos != null && photos.size() > 0) { List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("file");
return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(), photos); if (photos != null && photos.size() > 0) {
return saveImg(TSafeTroubleImg.ImgType.YH, safeTrouble.getUid(), photos);
}
} }
return R.ok(); return R.ok();
} }
...@@ -102,11 +107,15 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa ...@@ -102,11 +107,15 @@ public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSa
BeanUtils.copyProperties(query, safeTrouble); BeanUtils.copyProperties(query, safeTrouble);
safeTroubleMapper.updateById(safeTrouble); safeTroubleMapper.updateById(safeTrouble);
//保存隐患图片 Boolean ret = ServletFileUpload.isMultipartContent(request);
List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("file"); //保存隐患图片 变量名称只能用file 不能修改
if (photos != null && photos.size() > 0) { if(ret){
return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(), photos); List<MultipartFile> photos = ((MultipartHttpServletRequest) request).getFiles("file");
if (photos != null && photos.size() > 0) {
return saveImg(TSafeTroubleImg.ImgType.ZG, safeTrouble.getUid(), photos);
}
} }
return R.ok(); return R.ok();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment