Commit aba00f44 by jiang'yun

修改

parent 85457d64
...@@ -9,8 +9,10 @@ import java.util.List; ...@@ -9,8 +9,10 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.RuoYiConfig; import com.ruoyi.framework.config.RuoYiConfig;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.project.zjsgfa.domain.*; import com.ruoyi.project.zjsgfa.domain.*;
import com.ruoyi.project.zjsgfa.domain.Vo.DrillingFluidConstant; import com.ruoyi.project.zjsgfa.domain.Vo.DrillingFluidConstant;
import com.ruoyi.project.zjsgfa.mapper.*; import com.ruoyi.project.zjsgfa.mapper.*;
...@@ -97,6 +99,9 @@ public class SjDjjcController extends BaseController ...@@ -97,6 +99,9 @@ public class SjDjjcController extends BaseController
@Autowired @Autowired
private SjGztzMapper sjGztzMapper; private SjGztzMapper sjGztzMapper;
@Autowired
private ServerConfig serverConfig;
...@@ -1232,40 +1237,77 @@ public class SjDjjcController extends BaseController ...@@ -1232,40 +1237,77 @@ public class SjDjjcController extends BaseController
// List<XSSFPicture> pictures = getPictures(sheet); List<XSSFPicture> pictures = getPictures(sheet);
//
// // 遍历图片并处理 // 遍历图片并处理
// for (XSSFPicture picture : pictures) { for (XSSFPicture picture : pictures) {
// // 获取锚点信息(位置) // 获取锚点信息(位置)
// XSSFClientAnchor anchor = picture.getClientAnchor(); XSSFClientAnchor anchor = picture.getClientAnchor();
// XSSFPictureData pictureData = picture.getPictureData(); XSSFPictureData pictureData = picture.getPictureData();
// String ext = pictureData.suggestFileExtension(); String ext = pictureData.suggestFileExtension();
// String filePath = RuoYiConfig.getUploadPath()+"/gztz/"; String filePath = RuoYiConfig.getUploadPath()+"/gztz/";
// //判断是否为井位图 //判断是否为井位图
// if(isPictureInRow(anchor, 0, 40)){ if(isPictureInRow(anchor, 0, 0)){
// SjGztz sjGztz=new SjGztz(); SjGztz sjGztz=new SjGztz();
// sjGztz.setJh(jh); sjGztz.setJh(jh);
// sjGztz.setGzlx("井位图"); sjGztz.setGzlx("井位图");
// String fileName = UUID.randomUUID().toString(); String fileName = UUID.randomUUID().toString();
// String lj = filePath + fileName + "." + ext; String lj = filePath + fileName + "." + ext;
// sjGztz.setLj(lj);
// FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext)); File desc = new File(lj);
// fos.write(pictureData.getData());
// fos.close(); if (!desc.exists())
// sjGztzList.add(sjGztz); {
// }else if(isPictureInRow(anchor, 41, 81)){ if (!desc.getParentFile().exists())
// SjGztz sjGztz=new SjGztz(); {
// sjGztz.setJh(jh); desc.getParentFile().mkdirs();
// sjGztz.setGzlx("地震刨面图"); }
// String fileName = UUID.randomUUID().toString(); }
// String lj = filePath + fileName + "." + ext; sjGztz.setLj( Constants.RESOURCE_PREFIX +"/upload/gztz/"+fileName + "." + ext);
// sjGztz.setLj(lj); FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext));
// FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext)); fos.write(pictureData.getData());
// fos.write(pictureData.getData()); fos.close();
// fos.close(); sjGztzList.add(sjGztz);
// sjGztzList.add(sjGztz); }else if(isPictureInRow(anchor, 1, 1)){
// } SjGztz sjGztz=new SjGztz();
// } sjGztz.setJh(jh);
sjGztz.setGzlx("地震刨面图");
String fileName = UUID.randomUUID().toString();
String lj = filePath + fileName + "." + ext;
File desc = new File(lj);
if (!desc.exists())
{
if (!desc.getParentFile().exists())
{
desc.getParentFile().mkdirs();
}
}
sjGztz.setLj( Constants.RESOURCE_PREFIX +"/upload/gztz/"+fileName + "." + ext);
FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext));
fos.write(pictureData.getData());
fos.close();
sjGztzList.add(sjGztz);
}else if(isPictureInRow(anchor, 2, 2)){
SjGztz sjGztz=new SjGztz();
sjGztz.setJh(jh);
sjGztz.setGzlx("三压力刨面图");
String fileName = UUID.randomUUID().toString();
String lj = filePath + fileName + "." + ext;
File desc = new File(lj);
if (!desc.exists())
{
if (!desc.getParentFile().exists())
{
desc.getParentFile().mkdirs();
}
}
sjGztz.setLj( Constants.RESOURCE_PREFIX +"/upload/gztz/"+fileName + "." + ext);
FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext));
fos.write(pictureData.getData());
fos.close();
sjGztzList.add(sjGztz);
}
}
if(sjGztzList.size()>0){ if(sjGztzList.size()>0){
sjGztzMapper.deleteSjGztzByJh(jh); sjGztzMapper.deleteSjGztzByJh(jh);
sjGztzMapper.insertSjGztzBatch(sjGztzList); sjGztzMapper.insertSjGztzBatch(sjGztzList);
......
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