Skip to content

Z
zjsgfa_mysql
Commit 8d47ba62 by jiang'yun
Options

修改

parent 34704701
Showing with 1834 additions and 66 deletions
pom.xml
...@@ -196,11 +196,11 @@ ...@@ -196,11 +196,11 @@
</dependency> </dependency>
<!-- excel工具 --> <!-- excel工具 -->
<dependency> <!-- <dependency>-->
<groupId>org.apache.poi</groupId> <!-- <groupId>org.apache.poi</groupId>-->
<artifactId>poi-ooxml</artifactId> <!-- <artifactId>poi-ooxml</artifactId>-->
<version>5.2.5</version> <!-- <version>5.2.5</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>org.apache.poi</groupId>--> <!-- <groupId>org.apache.poi</groupId>-->
<!-- <artifactId>poi</artifactId>--> <!-- <artifactId>poi</artifactId>-->
...@@ -273,6 +273,32 @@ ...@@ -273,6 +273,32 @@
</dependency> </dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
<version>1.12.1</version>
</dependency>
<!-- 处理 Base64 解码 -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<!-- SVG 转 PNG 工具 -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
<version>1.16</version>
</dependency>
<!-- Batik 依赖（处理 SVG 样式和路径） -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-codec</artifactId>
<version>1.16</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjDjjcController.java
...@@ -4,12 +4,15 @@ import java.io.*; ...@@ -4,12 +4,15 @@ import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Base64; import java.util.stream.Collectors;
import java.util.List;
import java.util.UUID;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.PictureType;
import com.deepoove.poi.data.Pictures;
import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
import com.ruoyi.common.constant.Constants; 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;
...@@ -19,6 +22,7 @@ import com.ruoyi.project.zjsgfa.domain.Vo.DrillingFluidConstant; ...@@ -19,6 +22,7 @@ import com.ruoyi.project.zjsgfa.domain.Vo.DrillingFluidConstant;
import com.ruoyi.project.zjsgfa.mapper.*; import com.ruoyi.project.zjsgfa.mapper.*;
import com.ruoyi.project.zjsgfa.util.CxszhUtil; import com.ruoyi.project.zjsgfa.util.CxszhUtil;
import com.ruoyi.project.zjsgfa.util.ImageProcessUtil;
import com.ruoyi.project.zt.domain.CommonParam; import com.ruoyi.project.zt.domain.CommonParam;
import com.ruoyi.project.zt.domain.LjDzfc; import com.ruoyi.project.zt.domain.LjDzfc;
import com.ruoyi.project.zt.domain.Ljjw; import com.ruoyi.project.zt.domain.Ljjw;
...@@ -37,10 +41,15 @@ import com.ruoyi.framework.web.domain.AjaxResult; ...@@ -37,10 +41,15 @@ import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.framework.web.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.deepoove.poi.config.Configure;
import org.apache.commons.codec.binary.Base64;
/** /**
* 设计信息-井基础信息Controller * 设计信息-井基础信息Controller
* *
/**
* 设计信息-井基础信息Controller
*
* @author ruoyi * @author ruoyi
* @date 2025-06-23 * @date 2025-06-23
*/ */
...@@ -114,6 +123,14 @@ public class SjDjjcController extends BaseController ...@@ -114,6 +123,14 @@ public class SjDjjcController extends BaseController
@Autowired @Autowired
private SjFdsgcsDcyxMapper sjFdsgcsDcyxMapper; private SjFdsgcsDcyxMapper sjFdsgcsDcyxMapper;
@Autowired
private SjFdsgcsMapper sjFdsgcsMapper;
@Autowired
private ClFxsbMapper clFxsbMapper;
@Autowired
private SjJygjgdsjMapper sjJygjgdsjMapper;
...@@ -1205,47 +1222,6 @@ public class SjDjjcController extends BaseController ...@@ -1205,47 +1222,6 @@ public class SjDjjcController extends BaseController
// Drawing<?> drawing = sheet.getPoc();
// Drawing<?> drawing = sheet.getDrawingPatriarch();
//
// XSSFDrawing drawing2 = sheet.createDrawingPatriarch();
//
// for (Shape shape : drawing) {
// if (shape instanceof Picture) {
// Picture picture = (Picture) shape;
// XSSFClientAnchor anchor = (XSSFClientAnchor)picture.getClientAnchor();
// PictureData pictureData = picture.getPictureData();
// String ext = pictureData.suggestFileExtension();
// String filePath = RuoYiConfig.getUploadPath()+"/gztz/";
// //判断是否为井位图
// if(isPictureInRow(anchor, 0, 40)){
// SjGztz sjGztz=new SjGztz();
// sjGztz.setJh(jh);
// sjGztz.setGzlx("井位图");
// String fileName = UUID.randomUUID().toString();
// String lj = filePath + fileName + "." + ext;
// sjGztz.setLj(lj);
// FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext));
// fos.write(pictureData.getData());
// fos.close();
// sjGztzList.add(sjGztz);
// }else if(isPictureInRow(anchor, 41, 81)){
// SjGztz sjGztz=new SjGztz();
// sjGztz.setJh(jh);
// sjGztz.setGzlx("地震刨面图");
// String fileName = UUID.randomUUID().toString();
// String lj = filePath + fileName + "." + ext;
// sjGztz.setLj(lj);
// FileOutputStream fos = new FileOutputStream(new File(filePath+fileName+"." + ext));
// fos.write(pictureData.getData());
// fos.close();
// sjGztzList.add(sjGztz);
// }
//
//
// }
// }
...@@ -1385,6 +1361,7 @@ public class SjDjjcController extends BaseController ...@@ -1385,6 +1361,7 @@ public class SjDjjcController extends BaseController
} }
//邻井扫描 end--------------------------------------------------- //邻井扫描 end---------------------------------------------------
//邻井扫描 注意事项--------------------------------------------------- //邻井扫描 注意事项---------------------------------------------------
List<ClFxsb> clFxsbList = clFxsbMapper.selectClFxsbList(new ClFxsb());
sjZysxMapper.deleteSjZysxByJh(jh); sjZysxMapper.deleteSjZysxByJh(jh);
String zysx=new DataFormatter().formatCellValue(sheet.getRow(1).getCell(11)); String zysx=new DataFormatter().formatCellValue(sheet.getRow(1).getCell(11));
if(StringUtils.isNotEmpty(zysx)){ if(StringUtils.isNotEmpty(zysx)){
...@@ -1392,9 +1369,92 @@ public class SjDjjcController extends BaseController ...@@ -1392,9 +1369,92 @@ public class SjDjjcController extends BaseController
sjZysx.setJh(jh); sjZysx.setJh(jh);
sjZysx.setLb("邻井扫描"); sjZysx.setLb("邻井扫描");
sjZysx.setZysx(zysx); sjZysx.setZysx(zysx);
for(SjLjsm sjLjsm:sjLjsmList){
Double zjjl=sjLjsm.getBjzjjl();
Double js=sjLjsm.getJs();
if(zjjl<5){
if(StringUtils.isNotEmpty(sjZysx.getZysx())){
sjZysx.setZysx(sjZysx.getZysx()+"；本井在井深"+sjLjsm.getJs()+"m处与同台"+sjLjsm.getBjjh()+"井最近距离 "+zjjl+"m，现场施工时注意防碰");
}else {
sjZysx.setZysx("本井在井深"+sjLjsm.getJs()+"m处与同台"+sjLjsm.getBjjh()+"井最近距离 "+zjjl+"m，现场施工时注意防碰");
}
Double ksjs=0.0;
for(int i=0;i<sjJsjgList.size();i++){
SjJsjg sjJsjg = sjJsjgList.get(i);
String kc = sjJsjg.getKc();
if(i==0){
ksjs=0.0;
}else {
ksjs =sjJsjgList.get(i-1).getJs();
}
ClFxsb clFxsb = clFxsbList.stream().filter(it -> it.getFxys().equals("防碰距离")).findFirst().orElse(null);
if(js>ksjs&&js<sjJsjg.getJs()){
SjFdsgcs sjFdsgcs=new SjFdsgcs();
sjFdsgcs.setJh(jh);
sjFdsgcs.setKc(sjJsjg.getKc());
SjFdsgcs sjFdsgcs1 = sjFdsgcsMapper.selectSjFdsgcsByJhAndKc(sjFdsgcs);
if(sjFdsgcs1!=null){
if(clFxsb!=null){
String zjycs = clFxsb.getZjycs();
String gcjscs = clFxsb.getGcjscs();
String zyfx="防碰风险：本井在井深"+sjLjsm.getJs()+"m处与同台"+sjLjsm.getBjjh()+"井最近距离 "+zjjl+"m，现场施工时注意防碰；风险描述："+clFxsb.getFxms();
if(StringUtils.isNotEmpty(sjFdsgcs1.getZyfx())){
if(!sjFdsgcs1.getZyfx().contains("防碰风险")){
sjFdsgcs1.setZyfx(sjFdsgcs1.getZyfx()+"；"+zyfx);
}
}else {
sjFdsgcs1.setZyfx(zyfx);
}
if(StringUtils.isNotEmpty(zjycs)){
String zjycsms="防碰风险：钻井液措施："+zjycs;
if(StringUtils.isNotEmpty(sjFdsgcs1.getZjycs())){
if(!sjFdsgcs1.getZjycs().contains("防碰风险")){
sjFdsgcs1.setZjycs(sjFdsgcs1.getZjycs()+"；"+zjycsms);
}
}else {
sjFdsgcs1.setZjycs(zjycsms);
}
}
if(StringUtils.isNotEmpty(gcjscs)){
if(StringUtils.isNotEmpty(sjFdsgcs1.getZjgccs())){
if(!sjFdsgcs1.getZjgccs().contains("防碰风险")){
sjFdsgcs1.setZjgccs(sjFdsgcs1.getZjgccs()+"；防碰风险：工程技术措施："+gcjscs);
}
}else {
sjFdsgcs1.setZjgccs("防碰风险：工程技术措施："+gcjscs);
}
}
}
sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs1);
}else {
sjFdsgcs1=new SjFdsgcs();
sjFdsgcs1.setJh(jh);
sjFdsgcs1.setKc(kc);
if(clFxsb!=null){
String zjycs = clFxsb.getZjycs();
String gcjscs = clFxsb.getGcjscs();
sjFdsgcs1.setZyfx("本井在井深"+sjLjsm.getJs()+"m处与同台"+sjLjsm.getBjjh()+"井最近距离 "+zjjl+"m，现场施工时注意防碰；风险描述："+clFxsb.getFxms());
if(StringUtils.isNotEmpty(zjycs)){
sjFdsgcs1.setZjycs("防碰风险：钻井液措施："+zjycs);
}
if(StringUtils.isNotEmpty(gcjscs)){
sjFdsgcs1.setZjgccs("防碰风险：工程技术措施："+gcjscs);
}
}
sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs1);
}
}
}
}
}
sjZysxMapper.insertSjZysx(sjZysx); sjZysxMapper.insertSjZysx(sjZysx);
} }
//邻井扫描 注意事项end--------------------------------------------------- //邻井扫描 注意事项end---------------------------------------------------
//H2S table--------------------------------------------------- //H2S table---------------------------------------------------
sheet = workbook.getSheetAt(9); sheet = workbook.getSheetAt(9);
...@@ -1493,7 +1553,6 @@ public class SjDjjcController extends BaseController ...@@ -1493,7 +1553,6 @@ public class SjDjjcController extends BaseController
sjZysxMapper.insertSjZysx(sjZysx); sjZysxMapper.insertSjZysx(sjZysx);
} }
//浅层气end--------------------------------------------------- //浅层气end---------------------------------------------------
//计算地质分层 //计算地质分层
CommonParam param =new CommonParam(); CommonParam param =new CommonParam();
param.setJh(jh); param.setJh(jh);
...@@ -1514,20 +1573,14 @@ public class SjDjjcController extends BaseController ...@@ -1514,20 +1573,14 @@ public class SjDjjcController extends BaseController
} }
//计算垂深 //计算垂深
double targetCs = CxszhUtil.getCs(sjJygjGdsjgdcsList, sjJsjg.getJs()); double targetCs = CxszhUtil.getCs(sjJygjGdsjgdcsList, sjJsjg.getJs());
csaa = targetCs; csaa = targetCs;
sjFdsgcsDcyxList.addAll(processAndDisplay(dzfcList, previousDepth, targetCs, jh, sjJsjg.getKc())); sjFdsgcsDcyxList.addAll(processAndDisplay(dzfcList, previousDepth, targetCs, jh, sjJsjg.getKc()));
} }
if (sjFdsgcsDcyxList.size() > 0) { if (sjFdsgcsDcyxList.size() > 0) {
sjFdsgcsDcyxMapper.deleteSjFdsgcsDcyxByJh(jh); sjFdsgcsDcyxMapper.deleteSjFdsgcsDcyxByJh(jh);
sjFdsgcsDcyxMapper.insertSjFdsgcsDcyxBatch(sjFdsgcsDcyxList); sjFdsgcsDcyxMapper.insertSjFdsgcsDcyxBatch(sjFdsgcsDcyxList);
} }
} }
} catch (IOException e) { } catch (IOException e) {
e.getMessage(); e.getMessage();
e.printStackTrace(); e.printStackTrace();
...@@ -1637,6 +1690,130 @@ public class SjDjjcController extends BaseController ...@@ -1637,6 +1690,130 @@ public class SjDjjcController extends BaseController
return sjDjjcService.saveLjzl(param); return sjDjjcService.saveLjzl(param);
} }
/**
* 计算风险
*/
@PostMapping("/saveFx")
public AjaxResult saveFx(@RequestBody CommonParam param) throws Exception{
return sjDjjcService.saveLjzl(param);
}
@PostMapping("/exportWord")
public void exportWord(long id,HttpServletResponse response) throws Exception{
SjDjjc sjDjjc = sjDjjcService.selectSjDjjcById(id);
InputStream in = null;
XWPFTemplate template=null;
OutputStream os=null;
try {
in =this.getClass().getResourceAsStream("/static/excel/sgfamb.docx");
os = response.getOutputStream();
String fileName=sjDjjc.getJh()+"井施工方案";
// 设置响应头
response.setContentType("application/force-download");
response.setHeader("Content-Disposition",
"attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".docx");
//加载数据
Map<String, Object> data = buildDataModel(sjDjjc);
// 配置
LoopRowTableRenderPolicy policy=new LoopRowTableRenderPolicy();
Configure config = Configure.builder().useSpringEL()
.bind("sjDzfcList",policy)//行循环策略
.bind("sjJsjgList",policy)//行循环策略
.bind("sjJygjGdfdcsList",policy)//行循环策略
.bind("sjJygjGdsjgdcsList",policy)//行循环策略
.build();
XWPFTemplate compile = XWPFTemplate.compile(in, config);
// 加载模板并填充数据
template = compile.render(data);
template.write(os);
os.flush();
}catch (Exception e){
throw e;
}finally {
if(in!=null){
in.close();
}
if(template!=null){
template.close();
}
if(os!=null){
os.close();
}
}
}
public Map<String, Object> buildDataModel(SjDjjc sjDjjc) {
Map<String, Object> dataModel = new HashMap<>();
String jh = sjDjjc.getJh();
// 添加基础信息
dataModel.put("jh", jh);
dataModel.put("jb", sjDjjc.getJb());
dataModel.put("jx", sjDjjc.getJx());
dataModel.put("jkhzb", sjDjjc.getJkhzb());
dataModel.put("jkzzb", sjDjjc.getJkzzb());
dataModel.put("gzwz", sjDjjc.getGzwz());
dataModel.put("wzcw", sjDjjc.getWzcw());
dataModel.put("ztmd", sjDjjc.getZtmd());
dataModel.put("wzyz", sjDjjc.getWzyz());
dataModel.put("wjfa", sjDjjc.getWjfa());
SjDzfc sjDzfc =new SjDzfc();
sjDzfc.setSjjh(jh);
List<SjDzfc> sjDzfcList = sjDzfcMapper.selectSjDzfcList(sjDzfc);
dataModel.put("sjDzfcList", sjDzfcList);
SjJsjg sjJsjg =new SjJsjg();
sjJsjg.setJh(jh);
List<SjJsjg> sjJsjgList = sjJsjgMapper.selectSjJsjgList(sjJsjg);
dataModel.put("sjJsjgList", sjJsjgList);
//查询井身结构图
SjJsjgt sjJsjgt=sjJsjgMapper.selectSjJsjgtById(sjDjjc.getId()+"");
if(sjJsjgt!=null){
String svgContent = ImageProcessUtil.extractSvgFromBase64(sjJsjgt.getJsjgt());
InputStream pngStream = ImageProcessUtil.convertSvgToPng(svgContent);
PictureRenderData image = Pictures.ofStream(pngStream, PictureType.PNG)
.size(500, 600)
.create();
dataModel.put("jsjgt", image);
}else {
dataModel.put("jsjgt", null);
}
SjJygjInfo sjJygjInfo =new SjJygjInfo();
sjJygjInfo.setJh(jh);
List<SjJygjInfo> sjJygjInfos = sjJygjInfoMapper.selectSjJygjInfoList(sjJygjInfo);
String gdlx="";
if(sjJygjInfos.size()>0){
gdlx=sjJygjInfos.get(0).getGdlx();
}
dataModel.put("gdlx", gdlx);
//井眼轨迹分段参数
SjJygjGdfdcs sjJygjGdfdcs=new SjJygjGdfdcs();
sjJygjGdfdcs.setJh(jh);
List<SjJygjGdfdcs> sjJygjGdfdcsList = sjJygjGdfdcsMapper.selectSjJygjGdfdcsList(sjJygjGdfdcs);
dataModel.put("sjJygjGdfdcsList", sjJygjGdfdcsList);
// 添加井眼轨迹设计各点参数
SjJygjGdsjgdcs sjJygjGdsjgdcs =new SjJygjGdsjgdcs();
sjJygjGdsjgdcs.setJh(jh);
List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList = sjJygjGdsjgdcsMapper.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
dataModel.put("sjJygjGdsjgdcsList", sjJygjGdsjgdcsList);
return dataModel;
}
/** /**
...@@ -1700,4 +1877,5 @@ public class SjDjjcController extends BaseController ...@@ -1700,4 +1877,5 @@ public class SjDjjcController extends BaseController
} }
src/main/java/com/ruoyi/project/zjsgfa/controller/SjJsjgController.java
...@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.zjsgfa.domain.SjDjjc; import com.ruoyi.project.zjsgfa.domain.SjDjjc;
import com.ruoyi.project.zjsgfa.domain.SjJsjgt;
import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.usermodel.DataFormatter;
import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFSheet;
...@@ -108,6 +109,12 @@ public class SjJsjgController extends BaseController ...@@ -108,6 +109,12 @@ public class SjJsjgController extends BaseController
} }
@PostMapping("/savaJsjgt")
public AjaxResult savaJsjgt(@RequestBody SjJsjgt sjJsjg)
{
return AjaxResult.success(sjJsjgService.savaJsjgt(sjJsjg));
}
......
src/main/java/com/ruoyi/project/zjsgfa/controller/SjJygjgdsjController.java 0 → 100644
package com.ruoyi.project.zjsgfa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.project.zjsgfa.domain.SjJygjgdsj;
import com.ruoyi.project.zjsgfa.service.ISjJygjgdsjService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.page.TableDataInfo;
/**
* 设计-轨道设计Controller
*
* @author ruoyi
* @date 2025-08-14
*/
@RestController
@RequestMapping("/system/sjJygjgdsj")
public class SjJygjgdsjController extends BaseController
{
@Autowired
private ISjJygjgdsjService sjJygjgdsjService;
/**
* 查询设计-轨道设计列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjJygjgdsj:list')")
@GetMapping("/list")
public TableDataInfo list(SjJygjgdsj sjJygjgdsj)
{
// startPage();
List<SjJygjgdsj> list = sjJygjgdsjService.selectSjJygjgdsjList(sjJygjgdsj);
return getDataTable(list);
}
/**
* 导出设计-轨道设计列表
*/
//@PreAuthorize("@ss.hasPermi('system:sjJygjgdsj:export')")
@Log(title = "设计-轨道设计", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SjJygjgdsj sjJygjgdsj)
{
List<SjJygjgdsj> list = sjJygjgdsjService.selectSjJygjgdsjList(sjJygjgdsj);
ExcelUtil<SjJygjgdsj> util = new ExcelUtil<SjJygjgdsj>(SjJygjgdsj.class);
util.exportExcel(response, list, "设计-轨道设计数据");
}
/**
* 获取设计-轨道设计详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:sjJygjgdsj:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(sjJygjgdsjService.selectSjJygjgdsjById(id));
}
/**
* 新增设计-轨道设计
*/
//@PreAuthorize("@ss.hasPermi('system:sjJygjgdsj:add')")
@Log(title = "设计-轨道设计", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SjJygjgdsj sjJygjgdsj)
{
return toAjax(sjJygjgdsjService.insertSjJygjgdsj(sjJygjgdsj));
}
/**
* 修改设计-轨道设计
*/
//@PreAuthorize("@ss.hasPermi('system:sjJygjgdsj:edit')")
@Log(title = "设计-轨道设计", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SjJygjgdsj sjJygjgdsj)
{
return toAjax(sjJygjgdsjService.updateSjJygjgdsj(sjJygjgdsj));
}
/**
* 删除设计-轨道设计
*/
//@PreAuthorize("@ss.hasPermi('system:sjJygjgdsj:remove')")
@Log(title = "设计-轨道设计", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sjJygjgdsjService.deleteSjJygjgdsjByIds(ids));
}
}
src/main/java/com/ruoyi/project/zjsgfa/domain/ClFxsb.java 0 → 100644
package com.ruoyi.project.zjsgfa.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 常量-风险识别字典对象 cl_fxsb
*
* @author ruoyi
* @date 2025-08-13
*/
public class ClFxsb extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 风险类别 */
@Excel(name = "风险类别")
private String fxlb;
/** 风险因素 */
@Excel(name = "风险因素")
private String fxys;
/** 后果危害 */
@Excel(name = "后果危害")
private String hgwh;
/** 风险描述 */
@Excel(name = "风险描述")
private String fxms;
/** 判断条件 */
@Excel(name = "判断条件")
private String pdtj;
/** 关键参数模板 */
@Excel(name = "关键参数模板")
private String gjcsmb;
/** 工程技术措施 */
@Excel(name = "工程技术措施")
private String gcjscs;
/** 钻井液措施 */
@Excel(name = "钻井液措施")
private String zjycs;
/** 井控措施 */
@Excel(name = "井控措施")
private String jkcs;
/** 管理措施 */
@Excel(name = "管理措施")
private String glcs;
/** 特殊工具 */
@Excel(name = "特殊工具")
private String tsgj;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setFxlb(String fxlb)
{
this.fxlb = fxlb;
}
public String getFxlb()
{
return fxlb;
}
public void setFxys(String fxys)
{
this.fxys = fxys;
}
public String getFxys()
{
return fxys;
}
public void setHgwh(String hgwh)
{
this.hgwh = hgwh;
}
public String getHgwh()
{
return hgwh;
}
public void setFxms(String fxms)
{
this.fxms = fxms;
}
public String getFxms()
{
return fxms;
}
public void setPdtj(String pdtj)
{
this.pdtj = pdtj;
}
public String getPdtj()
{
return pdtj;
}
public void setGjcsmb(String gjcsmb)
{
this.gjcsmb = gjcsmb;
}
public String getGjcsmb()
{
return gjcsmb;
}
public void setGcjscs(String gcjscs)
{
this.gcjscs = gcjscs;
}
public String getGcjscs()
{
return gcjscs;
}
public void setZjycs(String zjycs)
{
this.zjycs = zjycs;
}
public String getZjycs()
{
return zjycs;
}
public void setJkcs(String jkcs)
{
this.jkcs = jkcs;
}
public String getJkcs()
{
return jkcs;
}
public void setGlcs(String glcs)
{
this.glcs = glcs;
}
public String getGlcs()
{
return glcs;
}
public void setTsgj(String tsgj)
{
this.tsgj = tsgj;
}
public String getTsgj()
{
return tsgj;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("fxlb", getFxlb())
.append("fxys", getFxys())
.append("hgwh", getHgwh())
.append("fxms", getFxms())
.append("pdtj", getPdtj())
.append("gjcsmb", getGjcsmb())
.append("gcjscs", getGcjscs())
.append("zjycs", getZjycs())
.append("jkcs", getJkcs())
.append("glcs", getGlcs())
.append("tsgj", getTsgj())
.toString();
}
}
src/main/java/com/ruoyi/project/zjsgfa/domain/SjDcfxTsyx.java
package com.ruoyi.project.zjsgfa.domain; package com.ruoyi.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-08-08 * @date 2025-08-08
*/ */
@Data
public class SjDcfxTsyx extends BaseEntity public class SjDcfxTsyx extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -34,6 +36,8 @@ public class SjDcfxTsyx extends BaseEntity ...@@ -34,6 +36,8 @@ public class SjDcfxTsyx extends BaseEntity
@Excel(name = "距顶深") @Excel(name = "距顶深")
private Double jds; private Double jds;
private String wt;
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
......
src/main/java/com/ruoyi/project/zjsgfa/domain/SjFdsgcs.java
package com.ruoyi.project.zjsgfa.domain; package com.ruoyi.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
...@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-08-06 * @date 2025-08-06
*/ */
@Data
public class SjFdsgcs extends BaseEntity public class SjFdsgcs extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -54,7 +56,10 @@ public class SjFdsgcs extends BaseEntity ...@@ -54,7 +56,10 @@ public class SjFdsgcs extends BaseEntity
@Excel(name = "风险管控措施") @Excel(name = "风险管控措施")
private String fxgkcs; private String fxgkcs;
public void setId(Long id)
private String zjycs;
private String zjgccs;
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
......
src/main/java/com/ruoyi/project/zjsgfa/domain/SjJsjg.java
...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain; ...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel;
...@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity; ...@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi * @author ruoyi
* @date 2025-06-24 * @date 2025-06-24
*/ */
@Data
public class SjJsjg extends BaseEntity public class SjJsjg extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
src/main/java/com/ruoyi/project/zjsgfa/domain/SjJsjgt.java 0 → 100644
package com.ruoyi.project.zjsgfa.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 井身结构图对象 sj_jsjgt
*
* @author ruoyi
* @date 2025-08-14
*/
public class SjJsjgt extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 主表id */
@Excel(name = "主表id")
private String zbid;
/** 井身结构图 */
@Excel(name = "井身结构图")
private String jsjgt;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setZbid(String zbid)
{
this.zbid = zbid;
}
public String getZbid()
{
return zbid;
}
public void setJsjgt(String jsjgt)
{
this.jsjgt = jsjgt;
}
public String getJsjgt()
{
return jsjgt;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("zbid", getZbid())
.append("jsjgt", getJsjgt())
.toString();
}
}
src/main/java/com/ruoyi/project/zjsgfa/domain/SjJygjgdsj.java 0 → 100644
package com.ruoyi.project.zjsgfa.domain;
import java.math.BigDecimal;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 设计-轨道设计对象 sj_jygjgdsj
*
* @author ruoyi
* @date 2025-08-14
*/
public class SjJygjgdsj extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 井号 */
@Excel(name = "井号")
private String jh;
/** 井底垂深 */
@Excel(name = "井底垂深")
private BigDecimal jdcs;
/** 井底闭合距 */
@Excel(name = "井底闭合距")
private BigDecimal jdbhj;
/** 井底闭合方位 */
@Excel(name = "井底闭合方位")
private BigDecimal jdbhfw;
/** 造斜点 */
@Excel(name = "造斜点")
private BigDecimal zxd;
/** 最大井斜角 */
@Excel(name = "最大井斜角")
private BigDecimal zdjxj;
/** 磁倾角 */
@Excel(name = "磁倾角")
private BigDecimal cqj;
/** 磁场强度 */
@Excel(name = "磁场强度")
private BigDecimal ccqd;
/** 磁偏角 */
@Excel(name = "磁偏角")
private BigDecimal cpj;
/** 收敛角 */
@Excel(name = "收敛角")
private BigDecimal slj;
/** 方位修正角 */
@Excel(name = "方位修正角")
private BigDecimal fwxzj;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setJh(String jh)
{
this.jh = jh;
}
public String getJh()
{
return jh;
}
public void setJdcs(BigDecimal jdcs)
{
this.jdcs = jdcs;
}
public BigDecimal getJdcs()
{
return jdcs;
}
public void setJdbhj(BigDecimal jdbhj)
{
this.jdbhj = jdbhj;
}
public BigDecimal getJdbhj()
{
return jdbhj;
}
public void setJdbhfw(BigDecimal jdbhfw)
{
this.jdbhfw = jdbhfw;
}
public BigDecimal getJdbhfw()
{
return jdbhfw;
}
public void setZxd(BigDecimal zxd)
{
this.zxd = zxd;
}
public BigDecimal getZxd()
{
return zxd;
}
public void setZdjxj(BigDecimal zdjxj)
{
this.zdjxj = zdjxj;
}
public BigDecimal getZdjxj()
{
return zdjxj;
}
public void setCqj(BigDecimal cqj)
{
this.cqj = cqj;
}
public BigDecimal getCqj()
{
return cqj;
}
public void setCcqd(BigDecimal ccqd)
{
this.ccqd = ccqd;
}
public BigDecimal getCcqd()
{
return ccqd;
}
public void setCpj(BigDecimal cpj)
{
this.cpj = cpj;
}
public BigDecimal getCpj()
{
return cpj;
}
public void setSlj(BigDecimal slj)
{
this.slj = slj;
}
public BigDecimal getSlj()
{
return slj;
}
public void setFwxzj(BigDecimal fwxzj)
{
this.fwxzj = fwxzj;
}
public BigDecimal getFwxzj()
{
return fwxzj;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("jh", getJh())
.append("jdcs", getJdcs())
.append("jdbhj", getJdbhj())
.append("jdbhfw", getJdbhfw())
.append("zxd", getZxd())
.append("zdjxj", getZdjxj())
.append("cqj", getCqj())
.append("ccqd", getCcqd())
.append("cpj", getCpj())
.append("slj", getSlj())
.append("fwxzj", getFwxzj())
.toString();
}
}
src/main/java/com/ruoyi/project/zjsgfa/mapper/ClFxsbMapper.java 0 → 100644
package com.ruoyi.project.zjsgfa.mapper;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.ClFxsb;
/**
* 常量-风险识别字典Mapper接口
*
* @author ruoyi
* @date 2025-08-13
*/
public interface ClFxsbMapper
{
/**
* 查询常量-风险识别字典
*
* @param id 常量-风险识别字典主键
* @return 常量-风险识别字典
*/
public ClFxsb selectClFxsbById(Long id);
/**
* 查询常量-风险识别字典列表
*
* @param clFxsb 常量-风险识别字典
* @return 常量-风险识别字典集合
*/
public List<ClFxsb> selectClFxsbList(ClFxsb clFxsb);
/**
* 新增常量-风险识别字典
*
* @param clFxsb 常量-风险识别字典
* @return 结果
*/
public int insertClFxsb(ClFxsb clFxsb);
/**
* 修改常量-风险识别字典
*
* @param clFxsb 常量-风险识别字典
* @return 结果
*/
public int updateClFxsb(ClFxsb clFxsb);
/**
* 删除常量-风险识别字典
*
* @param id 常量-风险识别字典主键
* @return 结果
*/
public int deleteClFxsbById(Long id);
/**
* 批量删除常量-风险识别字典
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteClFxsbByIds(Long[] ids);
}
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjDcfxTsyxMapper.java
...@@ -58,4 +58,9 @@ public interface SjDcfxTsyxMapper ...@@ -58,4 +58,9 @@ public interface SjDcfxTsyxMapper
* @return 结果 * @return 结果
*/ */
public int deleteSjDcfxTsyxByIds(Long[] ids); public int deleteSjDcfxTsyxByIds(Long[] ids);
int deleteSjDcfxTsyxByJh(String jh);
int insertSjDcfxTsyxBatch(List<SjDcfxTsyx> sjDcfxTsyxList);
} }
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjJsjgMapper.java
...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.mapper; ...@@ -2,6 +2,7 @@ package com.ruoyi.project.zjsgfa.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.zjsgfa.domain.SjJsjg; import com.ruoyi.project.zjsgfa.domain.SjJsjg;
import com.ruoyi.project.zjsgfa.domain.SjJsjgt;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
...@@ -64,4 +65,9 @@ public interface SjJsjgMapper ...@@ -64,4 +65,9 @@ public interface SjJsjgMapper
int insertSjJsjgBatch(@Param("list") List<SjJsjg> list); int insertSjJsjgBatch(@Param("list") List<SjJsjg> list);
int deleteSjJsjgtById(String zbid);
int insertSjJsjgt(SjJsjgt sjJsjgt);
SjJsjgt selectSjJsjgtById(String zbid);
} }
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjJygjgdsjMapper.java 0 → 100644
package com.ruoyi.project.zjsgfa.mapper;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.SjJygjgdsj;
/**
* 设计-轨道设计Mapper接口
*
* @author ruoyi
* @date 2025-08-14
*/
public interface SjJygjgdsjMapper
{
/**
* 查询设计-轨道设计
*
* @param id 设计-轨道设计主键
* @return 设计-轨道设计
*/
public SjJygjgdsj selectSjJygjgdsjById(Long id);
/**
* 查询设计-轨道设计列表
*
* @param sjJygjgdsj 设计-轨道设计
* @return 设计-轨道设计集合
*/
public List<SjJygjgdsj> selectSjJygjgdsjList(SjJygjgdsj sjJygjgdsj);
/**
* 新增设计-轨道设计
*
* @param sjJygjgdsj 设计-轨道设计
* @return 结果
*/
public int insertSjJygjgdsj(SjJygjgdsj sjJygjgdsj);
/**
* 修改设计-轨道设计
*
* @param sjJygjgdsj 设计-轨道设计
* @return 结果
*/
public int updateSjJygjgdsj(SjJygjgdsj sjJygjgdsj);
/**
* 删除设计-轨道设计
*
* @param id 设计-轨道设计主键
* @return 结果
*/
public int deleteSjJygjgdsjById(Long id);
/**
* 批量删除设计-轨道设计
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSjJygjgdsjByIds(Long[] ids);
}
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjZysxMapper.java
...@@ -61,4 +61,6 @@ public interface SjZysxMapper ...@@ -61,4 +61,6 @@ public interface SjZysxMapper
int deleteSjZysxByJh(String jh); int deleteSjZysxByJh(String jh);
SjZysx selectSjZysxByJh(String jh,String lb);
} }
src/main/java/com/ruoyi/project/zjsgfa/service/ISjJsjgService.java
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.ruoyi.project.zjsgfa.domain.SjJsjg; import com.ruoyi.project.zjsgfa.domain.SjJsjg;
import com.ruoyi.project.zjsgfa.domain.SjJsjgt;
/** /**
* 设计信息-井身结构Service接口 * 设计信息-井身结构Service接口
...@@ -63,4 +64,7 @@ public interface ISjJsjgService ...@@ -63,4 +64,7 @@ public interface ISjJsjgService
Map selectJsjgt(SjJsjg sjJsjg); Map selectJsjgt(SjJsjg sjJsjg);
int savaJsjgt(SjJsjgt sjJsjg);
} }
src/main/java/com/ruoyi/project/zjsgfa/service/ISjJygjgdsjService.java 0 → 100644
package com.ruoyi.project.zjsgfa.service;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.SjJygjgdsj;
/**
* 设计-轨道设计Service接口
*
* @author ruoyi
* @date 2025-08-14
*/
public interface ISjJygjgdsjService
{
/**
* 查询设计-轨道设计
*
* @param id 设计-轨道设计主键
* @return 设计-轨道设计
*/
public SjJygjgdsj selectSjJygjgdsjById(Long id);
/**
* 查询设计-轨道设计列表
*
* @param sjJygjgdsj 设计-轨道设计
* @return 设计-轨道设计集合
*/
public List<SjJygjgdsj> selectSjJygjgdsjList(SjJygjgdsj sjJygjgdsj);
/**
* 新增设计-轨道设计
*
* @param sjJygjgdsj 设计-轨道设计
* @return 结果
*/
public int insertSjJygjgdsj(SjJygjgdsj sjJygjgdsj);
/**
* 修改设计-轨道设计
*
* @param sjJygjgdsj 设计-轨道设计
* @return 结果
*/
public int updateSjJygjgdsj(SjJygjgdsj sjJygjgdsj);
/**
* 批量删除设计-轨道设计
*
* @param ids 需要删除的设计-轨道设计主键集合
* @return 结果
*/
public int deleteSjJygjgdsjByIds(Long[] ids);
/**
* 删除设计-轨道设计信息
*
* @param id 设计-轨道设计主键
* @return 结果
*/
public int deleteSjJygjgdsjById(Long id);
}
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java
...@@ -4,6 +4,8 @@ import java.util.ArrayList; ...@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.codec.Base64;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.zjsgfa.domain.*; import com.ruoyi.project.zjsgfa.domain.*;
import com.ruoyi.project.zjsgfa.mapper.*; import com.ruoyi.project.zjsgfa.mapper.*;
import com.ruoyi.project.zjsgfa.util.CxszhUtil; import com.ruoyi.project.zjsgfa.util.CxszhUtil;
...@@ -11,6 +13,7 @@ import com.ruoyi.project.zt.domain.Jsqa; ...@@ -11,6 +13,7 @@ import com.ruoyi.project.zt.domain.Jsqa;
import com.ruoyi.project.zt.mapper.DjdcInfoMapper; import com.ruoyi.project.zt.mapper.DjdcInfoMapper;
import com.ruoyi.project.zt.mapper.JsqaMapper; import com.ruoyi.project.zt.mapper.JsqaMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.project.zjsgfa.service.ISjFdsgcsService; import com.ruoyi.project.zjsgfa.service.ISjFdsgcsService;
...@@ -40,6 +43,12 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -40,6 +43,12 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
@Autowired @Autowired
private JsqaMapper jsqaMapper; private JsqaMapper jsqaMapper;
@Autowired
private ClFxsbMapper clFxsbMapper;
@Autowired
private SjZysxMapper sjZysxMapper;
/** /**
...@@ -87,6 +96,43 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -87,6 +96,43 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
@Override @Override
public int updateSjFdsgcs(SjFdsgcs sjFdsgcs) public int updateSjFdsgcs(SjFdsgcs sjFdsgcs)
{ {
if(StringUtils.isNotEmpty(sjFdsgcs.getGjfx())){
String s = new String(Base64.decode(sjFdsgcs.getGjfx()));
sjFdsgcs.setGjfx(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getGjyh())){
String s = new String(Base64.decode(sjFdsgcs.getGjyh()));
sjFdsgcs.setGjyh(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getDcyl())){
String s = new String(Base64.decode(sjFdsgcs.getDcyl()));
sjFdsgcs.setDcyl(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getZyfx())){
String s = new String(Base64.decode(sjFdsgcs.getZyfx()));
sjFdsgcs.setZyfx(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getFxgkcs())){
String s = new String(Base64.decode(sjFdsgcs.getFxgkcs()));
sjFdsgcs.setFxgkcs(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getZjycs())){
String s = new String(Base64.decode(sjFdsgcs.getZjycs()));
sjFdsgcs.setZjycs(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getZjgccs())){
String s = new String(Base64.decode(sjFdsgcs.getZjgccs()));
sjFdsgcs.setZjgccs(s);
}
return sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs); return sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs);
} }
...@@ -123,6 +169,8 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -123,6 +169,8 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
sjLjjw.setJh(sjFdsgcs.getJh()); sjLjjw.setJh(sjFdsgcs.getJh());
List<SjLjjw> sjLjjwList = sjLjjwMapper.selectSjLjjwList(sjLjjw); List<SjLjjw> sjLjjwList = sjLjjwMapper.selectSjLjjwList(sjLjjw);
List<ClFxsb> clFxsbList = clFxsbMapper.selectClFxsbList(new ClFxsb());
SjJygjGdsjgdcs sjJygjGdsjgdcs=new SjJygjGdsjgdcs(); SjJygjGdsjgdcs sjJygjGdsjgdcs=new SjJygjGdsjgdcs();
sjJygjGdsjgdcs.setJh(sjFdsgcs.getJh()); sjJygjGdsjgdcs.setJh(sjFdsgcs.getJh());
List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList = sjJygjGdsjgdcsMapper.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs); List<SjJygjGdsjgdcs> sjJygjGdsjgdcsList = sjJygjGdsjgdcsMapper.selectSjJygjGdsjgdcsList(sjJygjGdsjgdcs);
...@@ -148,11 +196,64 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -148,11 +196,64 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
jsqa.setJhs(collect); jsqa.setJhs(collect);
jsqa.setJs(sjJsjg1.getJs()); jsqa.setJs(sjJsjg1.getJs());
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa); List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
String zjycs="";
String zjgccs="";
String zyfx="";
if(jsqaList.size()>0){ if(jsqaList.size()>0){
List<String> fzqk=new ArrayList<>(); List<String> fzqk=new ArrayList<>();
jsqaList.forEach(item->{ for(Jsqa item: jsqaList){
fzqk.add(item.getJh()+"在"+item.getJs()+"时发生"+item.getFzqk()); fzqk.add(item.getJh()+"在"+item.getJs()+"时发生"+item.getFzqk());
}); if(StringUtils.isNotEmpty(zjycs)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zjycs.contains(item.getFzqk())){
zjycs=zjycs+"；"+item.getFzqk()+"：钻井液措施："+clFxsb.getZjycs();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zjycs=item.getFzqk()+"：钻井液措施："+clFxsb.getZjycs();
}
}
//
}
if(StringUtils.isNotEmpty(zjgccs)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zjgccs.contains(item.getFzqk())){
zjgccs=zjgccs+"；"+item.getFzqk()+"：钻井工程措施："+clFxsb.getGcjscs();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zjgccs=item.getFzqk()+"：钻井工程措施："+clFxsb.getGcjscs();
}
}
}
if(StringUtils.isNotEmpty(zyfx)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zyfx.contains(item.getFzqk())){
zyfx=zyfx+"；邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zyfx="邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}
sjFdsgcs.setZjgccs(zjgccs);
sjFdsgcs.setZjycs(zjycs);
sjFdsgcs.setZyfx(zyfx);
sjFdsgcs.setTzqk(String.join(";",fzqk)); sjFdsgcs.setTzqk(String.join(";",fzqk));
}else { }else {
sjFdsgcs.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成"); sjFdsgcs.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
...@@ -177,9 +278,144 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService ...@@ -177,9 +278,144 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
} }
} }
sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs); sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs);
}else {
//查询是否有复杂情况
if(collect.size()>0){
Jsqa jsqa= new Jsqa();
jsqa.setJhs(collect);
jsqa.setJs(sjJsjg1.getJs());
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
String zjycs="";
String zjgccs="";
String zyfx="";
if(jsqaList.size()>0){
List<String> fzqk=new ArrayList<>();
for(Jsqa item: jsqaList){
fzqk.add(item.getJh()+"在"+item.getJs()+"时发生"+item.getFzqk());
if(StringUtils.isNotEmpty(zjycs)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zjycs.contains(item.getFzqk())){
zjycs=zjycs+"；"+item.getFzqk()+"：钻井液措施："+clFxsb.getZjycs();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zjycs=item.getFzqk()+"：钻井液措施："+clFxsb.getZjycs();
}
}
//
}
if(StringUtils.isNotEmpty(zjgccs)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zjgccs.contains(item.getFzqk())){
zjgccs=zjgccs+"；"+item.getFzqk()+"：钻井工程措施："+clFxsb.getGcjscs();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zjgccs=item.getFzqk()+"：钻井工程措施："+clFxsb.getGcjscs();
}
}
}
if(StringUtils.isNotEmpty(zyfx)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zyfx.contains(item.getFzqk())){
zyfx=zyfx+"；邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zyfx="邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}
sjFdsgcs1.setZjgccs(zjgccs);
sjFdsgcs1.setZjycs(zjycs);
sjFdsgcs1.setZyfx(zyfx);
sjFdsgcs1.setTzqk(String.join(";",fzqk));
}else {
sjFdsgcs1.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
}
}else {
sjFdsgcs1.setTzqk("结合邻井"+kc+"无复杂数据，可实现一趟钻完成");
}
sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs1);
} }
} }
SjZysx sjZysx = sjZysxMapper.selectSjZysxByJh(sjFdsgcs.getJh(),"喷漏卡塌");
if(sjZysx!=null){
if(collect.size()>0){
Jsqa jsqa= new Jsqa();
jsqa.setJhs(collect);
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
String zyfx="";
if(jsqaList.size()>0){
for(Jsqa item: jsqaList){
if(StringUtils.isNotEmpty(zyfx)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zyfx.contains(item.getFzqk())){
zyfx=zyfx+"；邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zyfx="邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}
}
sjZysx.setZysx(zyfx);
}
}else {
sjZysx=new SjZysx();
sjZysx.setJh(sjFdsgcs.getJh());
sjZysx.setLb("喷漏卡塌");
if(collect.size()>0){
Jsqa jsqa= new Jsqa();
jsqa.setJhs(collect);
List<Jsqa> jsqaList=jsqaMapper.getJsqaByjhAndJs(jsqa);
String zyfx="";
if(jsqaList.size()>0){
for(Jsqa item: jsqaList){
if(StringUtils.isNotEmpty(zyfx)){
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
if(!zyfx.contains(item.getFzqk())){
zyfx=zyfx+"；邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}else {
for(ClFxsb clFxsb :clFxsbList){
if(clFxsb.getPdtj().contains(item.getFzqk())){
zyfx="邻井"+item.getJh()+"在"+item.getJs()+"m发生"+item.getFzqk()+"，风险描述："+clFxsb.getFxms();
}
}
}
}
}
sjZysx.setZysx(zyfx);
}
sjZysxMapper.insertSjZysx(sjZysx);
}
} }
} }
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjJsjgServiceImpl.java
...@@ -8,6 +8,7 @@ import java.util.Map; ...@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.project.zjsgfa.domain.SjJsjgt;
import com.ruoyi.project.zjsgfa.domain.SjJygjGdsjgdcs; import com.ruoyi.project.zjsgfa.domain.SjJygjGdsjgdcs;
import com.ruoyi.project.zjsgfa.mapper.SjJygjGdsjgdcsMapper; import com.ruoyi.project.zjsgfa.mapper.SjJygjGdsjgdcsMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -31,6 +32,8 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -31,6 +32,8 @@ public class SjJsjgServiceImpl implements ISjJsjgService
@Autowired @Autowired
private SjJygjGdsjgdcsMapper sjJygjGdsjgdcsMapper; private SjJygjGdsjgdcsMapper sjJygjGdsjgdcsMapper;
/** /**
* 查询设计信息-井身结构 * 查询设计信息-井身结构
* *
...@@ -319,4 +322,10 @@ public class SjJsjgServiceImpl implements ISjJsjgService ...@@ -319,4 +322,10 @@ public class SjJsjgServiceImpl implements ISjJsjgService
return map; return map;
} }
@Override
public int savaJsjgt(SjJsjgt sjJsjgt) {
sjJsjgMapper.deleteSjJsjgtById(sjJsjgt.getZbid());
return sjJsjgMapper.insertSjJsjgt(sjJsjgt);
}
} }
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjJygjgdsjServiceImpl.java 0 → 100644
package com.ruoyi.project.zjsgfa.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.zjsgfa.mapper.SjJygjgdsjMapper;
import com.ruoyi.project.zjsgfa.domain.SjJygjgdsj;
import com.ruoyi.project.zjsgfa.service.ISjJygjgdsjService;
/**
* 设计-轨道设计Service业务层处理
*
* @author ruoyi
* @date 2025-08-14
*/
@Service
public class SjJygjgdsjServiceImpl implements ISjJygjgdsjService
{
@Autowired
private SjJygjgdsjMapper sjJygjgdsjMapper;
/**
* 查询设计-轨道设计
*
* @param id 设计-轨道设计主键
* @return 设计-轨道设计
*/
@Override
public SjJygjgdsj selectSjJygjgdsjById(Long id)
{
return sjJygjgdsjMapper.selectSjJygjgdsjById(id);
}
/**
* 查询设计-轨道设计列表
*
* @param sjJygjgdsj 设计-轨道设计
* @return 设计-轨道设计
*/
@Override
public List<SjJygjgdsj> selectSjJygjgdsjList(SjJygjgdsj sjJygjgdsj)
{
return sjJygjgdsjMapper.selectSjJygjgdsjList(sjJygjgdsj);
}
/**
* 新增设计-轨道设计
*
* @param sjJygjgdsj 设计-轨道设计
* @return 结果
*/
@Override
public int insertSjJygjgdsj(SjJygjgdsj sjJygjgdsj)
{
return sjJygjgdsjMapper.insertSjJygjgdsj(sjJygjgdsj);
}
/**
* 修改设计-轨道设计
*
* @param sjJygjgdsj 设计-轨道设计
* @return 结果
*/
@Override
public int updateSjJygjgdsj(SjJygjgdsj sjJygjgdsj)
{
return sjJygjgdsjMapper.updateSjJygjgdsj(sjJygjgdsj);
}
/**
* 批量删除设计-轨道设计
*
* @param ids 需要删除的设计-轨道设计主键
* @return 结果
*/
@Override
public int deleteSjJygjgdsjByIds(Long[] ids)
{
return sjJygjgdsjMapper.deleteSjJygjgdsjByIds(ids);
}
/**
* 删除设计-轨道设计信息
*
* @param id 设计-轨道设计主键
* @return 结果
*/
@Override
public int deleteSjJygjgdsjById(Long id)
{
return sjJygjgdsjMapper.deleteSjJygjgdsjById(id);
}
}
src/main/java/com/ruoyi/project/zjsgfa/util/ImageProcessUtil.java 0 → 100644
package com.ruoyi.project.zjsgfa.util;
import org.apache.commons.codec.binary.Base64;
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.PNGTranscoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
public class ImageProcessUtil {
private static final Logger logger = LoggerFactory.getLogger(ImageProcessUtil.class);
/**
* 从完整Base64字符串中提取并解码SVG内容
*/
public static String extractSvgFromBase64(String fullBase64) {
if (fullBase64 == null || !fullBase64.startsWith("data:image/svg+xml")) {
logger.error("无效的SVG Base64格式");
return null;
}
try {
// 移除前缀（兼容带charset的格式）
String base64Content = fullBase64.replaceAll("^data:image/svg\\+xml;.*?base64,", "");
// 验证Base64格式
if (!Base64.isBase64(base64Content)) {
logger.error("Base64字符串格式无效");
return null;
}
// 解码为SVG字符串
byte[] svgBytes = Base64.decodeBase64(base64Content);
return new String(svgBytes, "UTF-8");
} catch (Exception e) {
logger.error("提取SVG内容失败", e);
return null;
}
}
/**
* 将SVG字符串转换为PNG输入流（确保字节流有效）
*/
public static InputStream convertSvgToPng(String svgContent) {
if (svgContent == null || svgContent.trim().isEmpty()) {
logger.error("SVG内容为空");
return null;
}
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
// 初始化Batik转换器
PNGTranscoder transcoder = new PNGTranscoder();
TranscoderInput input = new TranscoderInput(
new ByteArrayInputStream(svgContent.getBytes("UTF-8"))
);
TranscoderOutput output = new TranscoderOutput(outputStream);
// 执行转换
transcoder.transcode(input, output);
outputStream.flush();
// 验证转换结果
byte[] pngBytes = outputStream.toByteArray();
if (pngBytes.length == 0) {
logger.error("转换后的PNG字节流为空");
return null;
}
return new ByteArrayInputStream(pngBytes);
} catch (TranscoderException e) {
logger.error("SVG转换PNG失败（可能包含不支持的元素）", e);
return null;
} catch (Exception e) {
logger.error("PNG流处理失败", e);
return null;
}
}
}
\ No newline at end of file
src/main/java/com/ruoyi/project/zt/domain/LjDcyx.java
...@@ -45,5 +45,7 @@ public class LjDcyx { ...@@ -45,5 +45,7 @@ public class LjDcyx {
private Double yxdjsd1; private Double yxdjsd1;
private Double yxdjsd2; private Double yxdjsd2;
private String wt;
} }
src/main/java/com/ruoyi/project/zt/service/impl/DjdcServiceImpl.java
...@@ -83,6 +83,10 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -83,6 +83,10 @@ public class DjdcServiceImpl implements DjdcService {
@Autowired @Autowired
private SjDcfxTsyxMapper sjDcfxTsyxMapper; private SjDcfxTsyxMapper sjDcfxTsyxMapper;
@Autowired
private SjZysxMapper sjZysxMapper;
@Override @Override
public List<DjDcInfo> getList(DjDcInfo info) { public List<DjDcInfo> getList(DjDcInfo info) {
return djdcInfoMapper.getList(info); return djdcInfoMapper.getList(info);
...@@ -1600,6 +1604,7 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1600,6 +1604,7 @@ public class DjdcServiceImpl implements DjdcService {
commonParam.setJhs(stringArray2); commonParam.setJhs(stringArray2);
dcyxList = ljQueryMapper.getDcyxList(commonParam); dcyxList = ljQueryMapper.getDcyxList(commonParam);
} }
List<SjDcfxTsyx> sjDcfxTsyxList=new ArrayList<>();
if(dcyxList.size()>0){ if(dcyxList.size()>0){
for (SjDzfc item : sjDzfcs) { for (SjDzfc item : sjDzfcs) {
SjDcfxDzfc ljDzfc =new SjDcfxDzfc(); SjDcfxDzfc ljDzfc =new SjDcfxDzfc();
...@@ -1625,6 +1630,7 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1625,6 +1630,7 @@ public class DjdcServiceImpl implements DjdcService {
for(Tsyxclxx tsyxclxx:tsyxclxxes){ for(Tsyxclxx tsyxclxx:tsyxclxxes){
if(ljDcyx.getYxmc().contains(tsyxclxx.getTsyx())){ if(ljDcyx.getYxmc().contains(tsyxclxx.getTsyx())){
collect.add(tsyxclxx.getWt()); collect.add(tsyxclxx.getWt());
ljDcyx.setWt(tsyxclxx.getWt());
ljDcyxes1.add(ljDcyx); ljDcyxes1.add(ljDcyx);
} }
} }
...@@ -1651,9 +1657,10 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1651,9 +1657,10 @@ public class DjdcServiceImpl implements DjdcService {
sjDcfxTsyx.setJh(param.getJh()); sjDcfxTsyx.setJh(param.getJh());
sjDcfxTsyx.setCw(ljDcyx.getDcmc()); sjDcfxTsyx.setCw(ljDcyx.getDcmc());
sjDcfxTsyx.setTsyx(ljDcyx.getYxmc()); sjDcfxTsyx.setTsyx(ljDcyx.getYxmc());
Double cc=item.getSjdcs()+(item.getSjdcs()*bb); Double cc=item.getSjdcs()+(item.getSjhd()*bb);
sjDcfxTsyx.setJds(Double.parseDouble(String.format("%.2f",cc))); sjDcfxTsyx.setJds(Double.parseDouble(String.format("%.2f",cc)));
sjDcfxTsyxMapper.insertSjDcfxTsyx(sjDcfxTsyx); sjDcfxTsyx.setWt(ljDcyx.getWt());
sjDcfxTsyxList.add(sjDcfxTsyx);
} }
} }
...@@ -1741,6 +1748,23 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1741,6 +1748,23 @@ public class DjdcServiceImpl implements DjdcService {
} }
} }
if(sjDcfxTsyxList.size()>0){
SjZysx sjZysx=new SjZysx();
sjZysx.setLb("特殊岩性风险");
for(SjDcfxTsyx sjDcfxTsyx:sjDcfxTsyxList){
sjZysx.setJh(sjDcfxTsyx.getJh());
if(StringUtils.isNotEmpty(sjZysx.getZysx())){
sjZysx.setZysx(sjZysx.getZysx()+"； 层位："+sjDcfxTsyx.getCw()+" 岩性："+sjDcfxTsyx.getTsyx()+" 距顶深："+sjDcfxTsyx.getJds()+" 存在风险："+ sjDcfxTsyx.getWt());
}else {
sjZysx.setZysx("层位："+sjDcfxTsyx.getCw()+" 岩性："+sjDcfxTsyx.getTsyx()+" 距顶深："+sjDcfxTsyx.getJds()+" 存在风险："+ sjDcfxTsyx.getWt());
}
}
sjZysxMapper.insertSjZysx(sjZysx);
sjDcfxTsyxMapper.deleteSjDcfxTsyxByJh(sjDcfxTsyxList.get(0).getJh());
sjDcfxTsyxMapper.insertSjDcfxTsyxBatch(sjDcfxTsyxList);
}
list=list.stream().filter(item -> item.getCs()!=null).collect(Collectors.toList()); list=list.stream().filter(item -> item.getCs()!=null).collect(Collectors.toList());
return list; return list;
} }
......
src/main/resources/mybatis/zjsgfa/ClFxsbMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.zjsgfa.mapper.ClFxsbMapper">
<resultMap type="ClFxsb" id="ClFxsbResult">
<result property="id" column="id" />
<result property="fxlb" column="fxlb" />
<result property="fxys" column="fxys" />
<result property="hgwh" column="hgwh" />
<result property="fxms" column="fxms" />
<result property="pdtj" column="pdtj" />
<result property="gjcsmb" column="gjcsmb" />
<result property="gcjscs" column="gcjscs" />
<result property="zjycs" column="zjycs" />
<result property="jkcs" column="jkcs" />
<result property="glcs" column="glcs" />
<result property="tsgj" column="tsgj" />
</resultMap>
<sql id="selectClFxsbVo">
select id, fxlb, fxys, hgwh, fxms, pdtj, gjcsmb, gcjscs, zjycs, jkcs, glcs, tsgj from cl_fxsb
</sql>
<select id="selectClFxsbList" parameterType="ClFxsb" resultMap="ClFxsbResult">
<include refid="selectClFxsbVo"/>
<where>
<if test="fxlb != null and fxlb != ''"> and fxlb = #{fxlb}</if>
<if test="fxys != null and fxys != ''"> and fxys = #{fxys}</if>
<if test="hgwh != null and hgwh != ''"> and hgwh = #{hgwh}</if>
<if test="fxms != null and fxms != ''"> and fxms = #{fxms}</if>
<if test="pdtj != null and pdtj != ''"> and pdtj = #{pdtj}</if>
<if test="gjcsmb != null and gjcsmb != ''"> and gjcsmb = #{gjcsmb}</if>
<if test="gcjscs != null and gcjscs != ''"> and gcjscs = #{gcjscs}</if>
<if test="zjycs != null and zjycs != ''"> and zjycs = #{zjycs}</if>
<if test="jkcs != null and jkcs != ''"> and jkcs = #{jkcs}</if>
<if test="glcs != null and glcs != ''"> and glcs = #{glcs}</if>
<if test="tsgj != null and tsgj != ''"> and tsgj = #{tsgj}</if>
</where>
</select>
<select id="selectClFxsbById" parameterType="Long" resultMap="ClFxsbResult">
<include refid="selectClFxsbVo"/>
where id = #{id}
</select>
<insert id="insertClFxsb" parameterType="ClFxsb" useGeneratedKeys="true" keyProperty="id">
insert into cl_fxsb
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fxlb != null">fxlb,</if>
<if test="fxys != null">fxys,</if>
<if test="hgwh != null">hgwh,</if>
<if test="fxms != null">fxms,</if>
<if test="pdtj != null">pdtj,</if>
<if test="gjcsmb != null">gjcsmb,</if>
<if test="gcjscs != null">gcjscs,</if>
<if test="zjycs != null">zjycs,</if>
<if test="jkcs != null">jkcs,</if>
<if test="glcs != null">glcs,</if>
<if test="tsgj != null">tsgj,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fxlb != null">#{fxlb},</if>
<if test="fxys != null">#{fxys},</if>
<if test="hgwh != null">#{hgwh},</if>
<if test="fxms != null">#{fxms},</if>
<if test="pdtj != null">#{pdtj},</if>
<if test="gjcsmb != null">#{gjcsmb},</if>
<if test="gcjscs != null">#{gcjscs},</if>
<if test="zjycs != null">#{zjycs},</if>
<if test="jkcs != null">#{jkcs},</if>
<if test="glcs != null">#{glcs},</if>
<if test="tsgj != null">#{tsgj},</if>
</trim>
</insert>
<update id="updateClFxsb" parameterType="ClFxsb">
update cl_fxsb
<trim prefix="SET" suffixOverrides=",">
<if test="fxlb != null">fxlb = #{fxlb},</if>
<if test="fxys != null">fxys = #{fxys},</if>
<if test="hgwh != null">hgwh = #{hgwh},</if>
<if test="fxms != null">fxms = #{fxms},</if>
<if test="pdtj != null">pdtj = #{pdtj},</if>
<if test="gjcsmb != null">gjcsmb = #{gjcsmb},</if>
<if test="gcjscs != null">gcjscs = #{gcjscs},</if>
<if test="zjycs != null">zjycs = #{zjycs},</if>
<if test="jkcs != null">jkcs = #{jkcs},</if>
<if test="glcs != null">glcs = #{glcs},</if>
<if test="tsgj != null">tsgj = #{tsgj},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteClFxsbById" parameterType="Long">
delete from cl_fxsb where id = #{id}
</delete>
<delete id="deleteClFxsbByIds" parameterType="String">
delete from cl_fxsb where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjDcfxTsyxMapper.xml
...@@ -46,6 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -46,6 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jds != null">#{jds},</if> <if test="jds != null">#{jds},</if>
</trim> </trim>
</insert> </insert>
<insert id="insertSjDcfxTsyxBatch">
insert into sj_dcfx_tsyx (jh,tsyx,cw,jds) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.jh},#{item.tsyx},#{item.cw},#{item.jds})
</foreach>
</insert>
<update id="updateSjDcfxTsyx" parameterType="SjDcfxTsyx"> <update id="updateSjDcfxTsyx" parameterType="SjDcfxTsyx">
update sj_dcfx_tsyx update sj_dcfx_tsyx
...@@ -68,4 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -68,4 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<delete id="deleteSjDcfxTsyxByJh">
delete from sj_dcfx_tsyx where jh = #{jh}
</delete>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjDzfcMapper.xml
...@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</if> </if>
</where> </where>
order by sjjh,sjdcs order by sjjh,sjdcs is null ,sjdcs
</select> </select>
<select id="selectSjDzfcById" parameterType="Long" resultMap="SjDzfcResult"> <select id="selectSjDzfcById" parameterType="Long" resultMap="SjDzfcResult">
......
src/main/resources/mybatis/zjsgfa/SjFdsgcsMapper.xml
...@@ -15,10 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -15,10 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dcyl" column="dcyl" /> <result property="dcyl" column="dcyl" />
<result property="zyfx" column="zyfx" /> <result property="zyfx" column="zyfx" />
<result property="fxgkcs" column="fxgkcs" /> <result property="fxgkcs" column="fxgkcs" />
<result property="zjycs" column="zjycs" />
<result property="zjgccs" column="zjgccs" />
</resultMap> </resultMap>
<sql id="selectSjFdsgcsVo"> <sql id="selectSjFdsgcsVo">
select id, jh, kc, tzqk, jdqk, gjfx, gjyh, dcyl, zyfx, fxgkcs from sj_fdsgcs select id, jh, kc, tzqk, jdqk, gjfx, gjyh, dcyl, zyfx, fxgkcs, zjycs, zjgccs from sj_fdsgcs
</sql> </sql>
<select id="selectSjFdsgcsList" parameterType="SjFdsgcs" resultMap="SjFdsgcsResult"> <select id="selectSjFdsgcsList" parameterType="SjFdsgcs" resultMap="SjFdsgcsResult">
...@@ -41,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -41,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="selectSjFdsgcsByJhAndKc" resultType="com.ruoyi.project.zjsgfa.domain.SjFdsgcs"> <select id="selectSjFdsgcsByJhAndKc" resultType="com.ruoyi.project.zjsgfa.domain.SjFdsgcs">
select id, jh, kc, tzqk, jdqk, gjfx, gjyh, dcyl, zyfx, fxgkcs from sj_fdsgcs where jh = #{jh} and kc = #{kc} select id, jh, kc, tzqk, jdqk, gjfx, gjyh, dcyl, zyfx, fxgkcs, zjycs, zjgccs from sj_fdsgcs where jh = #{jh} and kc = #{kc}
</select> </select>
<insert id="insertSjFdsgcs" parameterType="SjFdsgcs" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSjFdsgcs" parameterType="SjFdsgcs" useGeneratedKeys="true" keyProperty="id">
...@@ -56,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -56,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dcyl != null">dcyl,</if> <if test="dcyl != null">dcyl,</if>
<if test="zyfx != null">zyfx,</if> <if test="zyfx != null">zyfx,</if>
<if test="fxgkcs != null">fxgkcs,</if> <if test="fxgkcs != null">fxgkcs,</if>
<if test="zjycs != null">zjycs,</if>
<if test="zjgccs != null">zjgccs,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if> <if test="jh != null">#{jh},</if>
...@@ -67,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -67,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dcyl != null">#{dcyl},</if> <if test="dcyl != null">#{dcyl},</if>
<if test="zyfx != null">#{zyfx},</if> <if test="zyfx != null">#{zyfx},</if>
<if test="fxgkcs != null">#{fxgkcs},</if> <if test="fxgkcs != null">#{fxgkcs},</if>
<if test="zjycs != null">#{zjycs},</if>
<if test="zjgccs != null">#{zjgccs},</if>
</trim> </trim>
</insert> </insert>
...@@ -82,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -82,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dcyl != null">dcyl = #{dcyl},</if> <if test="dcyl != null">dcyl = #{dcyl},</if>
<if test="zyfx != null">zyfx = #{zyfx},</if> <if test="zyfx != null">zyfx = #{zyfx},</if>
<if test="fxgkcs != null">fxgkcs = #{fxgkcs},</if> <if test="fxgkcs != null">fxgkcs = #{fxgkcs},</if>
<if test="zjycs != null">zjycs = #{zjycs},</if>
<if test="zjgccs != null">zjgccs = #{zjgccs},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
src/main/resources/mybatis/zjsgfa/SjJsjgMapper.xml
...@@ -47,6 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -47,6 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSjJsjgVo"/> <include refid="selectSjJsjgVo"/>
where id = #{id} where id = #{id}
</select> </select>
<select id="selectSjJsjgtById" resultType="com.ruoyi.project.zjsgfa.domain.SjJsjgt">
select * from sj_jsjgt
where zbid = #{zbid} limit 1
</select>
<insert id="insertSjJsjg" parameterType="SjJsjg" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSjJsjg" parameterType="SjJsjg" useGeneratedKeys="true" keyProperty="id">
insert into sj_jsjg insert into sj_jsjg
...@@ -87,6 +91,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -87,6 +91,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( #{item.jh}, #{item.kc}, #{item.ztzj}, #{item.js}, #{item.ttwj}, #{item.ttds}, #{item.ttxs}, #{item.snfg}, #{item.bz}) ( #{item.jh}, #{item.kc}, #{item.ztzj}, #{item.js}, #{item.ttwj}, #{item.ttds}, #{item.ttxs}, #{item.snfg}, #{item.bz})
</foreach> </foreach>
</insert> </insert>
<insert id="insertSjJsjgt">
insert into sj_jsjgt
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="zbid != null">zbid,</if>
<if test="jsjgt != null">jsjgt,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if>
<if test="jsjgt != null">#{jsjgt},</if>
</trim>
</insert>
<update id="updateSjJsjg" parameterType="SjJsjg"> <update id="updateSjJsjg" parameterType="SjJsjg">
update sj_jsjg update sj_jsjg
...@@ -121,4 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -121,4 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteSjJsjgByJh"> <delete id="deleteSjJsjgByJh">
delete from sj_jsjg where jh = #{jh} delete from sj_jsjg where jh = #{jh}
</delete> </delete>
<delete id="deleteSjJsjgtById">
delete from sj_jsjgt where zbid = #{zbid}
</delete>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjJsjgtMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.zjsgfa.mapper.SjJsjgtMapper">
<resultMap type="SjJsjgt" id="SjJsjgtResult">
<result property="id" column="id" />
<result property="zbid" column="zbid" />
<result property="jsjgt" column="jsjgt" />
</resultMap>
<sql id="selectSjJsjgtVo">
select id, zbid, jsjgt from sj_jsjgt
</sql>
<select id="selectSjJsjgtList" parameterType="SjJsjgt" resultMap="SjJsjgtResult">
<include refid="selectSjJsjgtVo"/>
<where>
<if test="zbid != null and zbid != ''"> and zbid = #{zbid}</if>
<if test="jsjgt != null and jsjgt != ''"> and jsjgt = #{jsjgt}</if>
</where>
</select>
<select id="selectSjJsjgtById" parameterType="Long" resultMap="SjJsjgtResult">
<include refid="selectSjJsjgtVo"/>
where id = #{id}
</select>
<insert id="insertSjJsjgt" parameterType="SjJsjgt" useGeneratedKeys="true" keyProperty="id">
insert into sj_jsjgt
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="zbid != null">zbid,</if>
<if test="jsjgt != null">jsjgt,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if>
<if test="jsjgt != null">#{jsjgt},</if>
</trim>
</insert>
<update id="updateSjJsjgt" parameterType="SjJsjgt">
update sj_jsjgt
<trim prefix="SET" suffixOverrides=",">
<if test="zbid != null">zbid = #{zbid},</if>
<if test="jsjgt != null">jsjgt = #{jsjgt},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSjJsjgtById" parameterType="Long">
delete from sj_jsjgt where id = #{id}
</delete>
<delete id="deleteSjJsjgtByIds" parameterType="String">
delete from sj_jsjgt where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjJygjgdsjMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.zjsgfa.mapper.SjJygjgdsjMapper">
<resultMap type="SjJygjgdsj" id="SjJygjgdsjResult">
<result property="id" column="id" />
<result property="jh" column="jh" />
<result property="jdcs" column="jdcs" />
<result property="jdbhj" column="jdbhj" />
<result property="jdbhfw" column="jdbhfw" />
<result property="zxd" column="zxd" />
<result property="zdjxj" column="zdjxj" />
<result property="cqj" column="cqj" />
<result property="ccqd" column="ccqd" />
<result property="cpj" column="cpj" />
<result property="slj" column="slj" />
<result property="fwxzj" column="fwxzj" />
</resultMap>
<sql id="selectSjJygjgdsjVo">
select id, jh, jdcs, jdbhj, jdbhfw, zxd, zdjxj, cqj, ccqd, cpj, slj, fwxzj from sj_jygjgdsj
</sql>
<select id="selectSjJygjgdsjList" parameterType="SjJygjgdsj" resultMap="SjJygjgdsjResult">
<include refid="selectSjJygjgdsjVo"/>
<where>
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="jdcs != null "> and jdcs = #{jdcs}</if>
<if test="jdbhj != null "> and jdbhj = #{jdbhj}</if>
<if test="jdbhfw != null "> and jdbhfw = #{jdbhfw}</if>
<if test="zxd != null "> and zxd = #{zxd}</if>
<if test="zdjxj != null "> and zdjxj = #{zdjxj}</if>
<if test="cqj != null "> and cqj = #{cqj}</if>
<if test="ccqd != null "> and ccqd = #{ccqd}</if>
<if test="cpj != null "> and cpj = #{cpj}</if>
<if test="slj != null "> and slj = #{slj}</if>
<if test="fwxzj != null "> and fwxzj = #{fwxzj}</if>
</where>
</select>
<select id="selectSjJygjgdsjById" parameterType="Long" resultMap="SjJygjgdsjResult">
<include refid="selectSjJygjgdsjVo"/>
where id = #{id}
</select>
<insert id="insertSjJygjgdsj" parameterType="SjJygjgdsj" useGeneratedKeys="true" keyProperty="id">
insert into sj_jygjgdsj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jh != null">jh,</if>
<if test="jdcs != null">jdcs,</if>
<if test="jdbhj != null">jdbhj,</if>
<if test="jdbhfw != null">jdbhfw,</if>
<if test="zxd != null">zxd,</if>
<if test="zdjxj != null">zdjxj,</if>
<if test="cqj != null">cqj,</if>
<if test="ccqd != null">ccqd,</if>
<if test="cpj != null">cpj,</if>
<if test="slj != null">slj,</if>
<if test="fwxzj != null">fwxzj,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if>
<if test="jdcs != null">#{jdcs},</if>
<if test="jdbhj != null">#{jdbhj},</if>
<if test="jdbhfw != null">#{jdbhfw},</if>
<if test="zxd != null">#{zxd},</if>
<if test="zdjxj != null">#{zdjxj},</if>
<if test="cqj != null">#{cqj},</if>
<if test="ccqd != null">#{ccqd},</if>
<if test="cpj != null">#{cpj},</if>
<if test="slj != null">#{slj},</if>
<if test="fwxzj != null">#{fwxzj},</if>
</trim>
</insert>
<update id="updateSjJygjgdsj" parameterType="SjJygjgdsj">
update sj_jygjgdsj
<trim prefix="SET" suffixOverrides=",">
<if test="jh != null">jh = #{jh},</if>
<if test="jdcs != null">jdcs = #{jdcs},</if>
<if test="jdbhj != null">jdbhj = #{jdbhj},</if>
<if test="jdbhfw != null">jdbhfw = #{jdbhfw},</if>
<if test="zxd != null">zxd = #{zxd},</if>
<if test="zdjxj != null">zdjxj = #{zdjxj},</if>
<if test="cqj != null">cqj = #{cqj},</if>
<if test="ccqd != null">ccqd = #{ccqd},</if>
<if test="cpj != null">cpj = #{cpj},</if>
<if test="slj != null">slj = #{slj},</if>
<if test="fwxzj != null">fwxzj = #{fwxzj},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSjJygjgdsjById" parameterType="Long">
delete from sj_jygjgdsj where id = #{id}
</delete>
<delete id="deleteSjJygjgdsjByIds" parameterType="String">
delete from sj_jygjgdsj where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjZysxMapper.xml
...@@ -36,6 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -36,6 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSjZysxVo"/> <include refid="selectSjZysxVo"/>
where id = #{id} where id = #{id}
</select> </select>
<select id="selectSjZysxByJh" resultType="com.ruoyi.project.zjsgfa.domain.SjZysx">
<include refid="selectSjZysxVo"/>
where jh = #{jh} and lb=#{lb}
</select>
<insert id="insertSjZysx" parameterType="SjZysx" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSjZysx" parameterType="SjZysx" useGeneratedKeys="true" keyProperty="id">
insert into sj_zysx insert into sj_zysx
......
src/main/resources/mybatis/zt/JsqaMapper.xml
...@@ -30,6 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -30,6 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{jh} #{jh}
</foreach> </foreach>
</if> </if>
and JS &lt;=#{js} <if test="js!=null">
and JS &lt;=#{js}
</if>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
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