Skip to content

Z
zjsgfa_mysql
Commit 89301a60 by jiang'yun
Options

修改

parent 7ad87d8b
Showing with 211 additions and 7 deletions
src/main/java/com/ruoyi/project/zjsgfa/controller/SjDjjcController.java
......@@ -1796,7 +1796,7 @@ public class SjDjjcController extends BaseController
}
/**
* 计算风险
* 计算钻头
*/
@PostMapping("/saveZtxh")
public AjaxResult saveZtxh(@RequestBody CommonParam param) throws Exception{
......
src/main/java/com/ruoyi/project/zjsgfa/domain/SjSggyZjzhcs.java
package com.ruoyi.project.zjsgfa.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
......@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2025-08-18
*/
@Data
public class SjSggyZjzhcs extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -22,6 +24,8 @@ public class SjSggyZjzhcs extends BaseEntity
@Excel(name = "井号")
private String jh;
private String kc;
/** 井段 */
@Excel(name = "井段")
private String jd;
......
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjLjtjztMapper.java
......@@ -61,4 +61,6 @@ public interface SjLjtjztMapper
int insertSjLjtjztBatch(List<SjLjtjzt> sjLjtjztList);
int deleteSjLjtjztByJh(String jh);
}
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjSggyZjzhcsMapper.java
......@@ -58,4 +58,9 @@ public interface SjSggyZjzhcsMapper
* @return 结果
*/
public int deleteSjSggyZjzhcsByIds(Long[] ids);
int deleteSjSggyZjzhcsByZjzhcs(SjSggyZjzhcs sjSggyZjzhcs);
SjSggyZjzhcs selectSjSggyZjzhcsByZjzhcs(SjSggyZjzhcs sjSggyZjzhcs);
}
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjZjcsxxMapper.java
......@@ -58,4 +58,7 @@ public interface SjZjcsxxMapper
* @return 结果
*/
public int deleteSjZjcsxxByIds(Long[] ids);
int deleteSjZjcsxxByZjcsxx(SjZjcsxx sjZjcsxx);
}
src/main/java/com/ruoyi/project/zjsgfa/mapper/SjZtxxMapper.java
......@@ -58,4 +58,7 @@ public interface SjZtxxMapper
* @return 结果
*/
public int deleteSjZtxxByIds(Long[] ids);
int deleteSjZtxxByZtxx(SjZtxx sjZtxx);
}
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
......@@ -14,6 +14,7 @@ import com.ruoyi.project.zjsgfa.domain.*;
import com.ruoyi.project.zjsgfa.mapper.*;
import com.ruoyi.project.zt.domain.*;
import com.ruoyi.project.zt.domain.vo.SjInfo;
import com.ruoyi.project.zt.mapper.JsaaMapper;
import com.ruoyi.project.zt.service.DjdcService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -53,6 +54,18 @@ public class SjDjjcServiceImpl implements ISjDjjcService
@Autowired
private SjZtxxMapper sjZtxxMapper;
@Autowired
private SjZjcsxxMapper sjZjcsxxMapper;
@Autowired
private JsaaMapper jsaaMapper;
@Autowired
private SjFdsgcsMapper sjFdsgcsMapper;
@Autowired
private SjSggyZjzhcsMapper sjSggyZjzhcsMapper;
/**
* 查询设计信息-井基础信息
......@@ -256,11 +269,20 @@ public class SjDjjcServiceImpl implements ISjDjjcService
sjJsjg.setJh(jh);
List<SjJsjg> sjJsjgList = sjJsjgMapper.selectSjJsjgList(sjJsjg);
List<SjLjtjzt> sjLjtjztList=new ArrayList<>();
double ksjs=0;
for(int i=0;i<sjJsjgList.size();i++){
SjJsjg sjJsjg1 = sjJsjgList.get(i);
if(i==0){
ksjs=0;;
}else {
ksjs=sjJsjgList.get(i-1).getJs();
}
final int kc=i+1;
//查询钻头关键数据
List<SjZtgjsj> collect = sjZtgjsjList.stream().filter(it -> it.getKc().equals(kc + "")).collect(Collectors.toList()).stream().sorted(Comparator.comparing(SjZtgjsj::getJxzs)).collect(Collectors.toList());
List<SjZtgjsj> collect = sjZtgjsjList.stream()
.filter(it -> String.valueOf(kc).equals(it.getKc()))
.sorted(Comparator.comparing(SjZtgjsj::getJxzs).reversed()) // 倒序
.collect(Collectors.toList());
if(collect.size()>3){
collect=collect.subList(0,3);
}
......@@ -284,19 +306,90 @@ public class SjDjjcServiceImpl implements ISjDjjcService
djjc.setJxzs(it.getJxzs());
Djjc djjc1=djdcService.selectZtsj(djjc);
if(djjc1!=null){
sjLjtjzt.setZjjd(djjc1.getCj());
sjLjtjzt.setCj(djjc1.getCj());
}
sjLjtjztList.add(sjLjtjzt);
});
if(collect.size()>0){
SjZtgjsj sjZtgjsj1 = collect.get(0);
sjZtxx.setJh(jh);
sjZtxx.setLb("邻井推荐");
sjZtxx.setKc(sjJsjg1.getKc());
sjZtxx.setZtxh(collect.get(0).getZtxh());
sjZtxxMapper.deleteSjZtxxByZtxx(sjZtxx);
sjZtxxMapper.insertSjZtxx(sjZtxx);
//施工参数
SjZjcsxx sjZjcsxx =new SjZjcsxx();
sjZjcsxx.setJh(jh);
sjZjcsxx.setKc(sjJsjg1.getKc());
sjZjcsxx.setJd(ksjs+"-"+sjJsjg1.getJs());
sjZjcsxx.setZtxh(sjZtgjsj1.getZtxh());
sjZjcsxx.setCc(sjZtgjsj1.getZtcc()+"");
sjZjcsxx.setSy(sjZtgjsj1.getPz()+"");
sjZjcsxx.setZjymd(sjZtgjsj1.getZjymd()+"");
sjZjcsxx.setZjpl(sjZtgjsj1.getPl()+"");
sjZjcsxx.setZjby(sjZtgjsj1.getLgby()+"");
//查询厂家
Djjc djjc = new Djjc();
djjc.setJh(sjZtgjsj1.getLjjh());
djjc.setKc(kc+"");
djjc.setJd(sjZtgjsj1.getJd());
djjc.setJxzs(sjZtgjsj1.getJxzs());
Djjc djjc1=djdcService.selectZtsj(djjc);
if(djjc1!=null){
sjZjcsxx.setCj(djjc1.getCj());
sjZjcsxx.setYj(djjc1.getZtyj()+"");
sjZjcsxx.setZjzy(djjc1.getZy());
sjZjcsxx.setZjzs(djjc1.getZs()+"");
}
sjZjcsxxMapper.deleteSjZjcsxxByZjcsxx(sjZjcsxx);
sjZjcsxxMapper.insertSjZjcsxx(sjZjcsxx);
Jsfa jsfa =new Jsfa();
jsfa.setJh(sjZtgjsj1.getLjjh());
jsfa.setZjjd(sjZtgjsj1.getJd());
Jsfa jsfa1=jsaaMapper.selectJsfa(jsfa);
String zjzh="";
if(jsfa1!=null){
zjzh = jsfa1.getZjzh();
}
SjFdsgcs sjFdsgcs =new SjFdsgcs();
sjFdsgcs.setJh(jh);
sjFdsgcs.setKc(sjJsjg1.getKc());
SjFdsgcs sjFdsgcs1 = sjFdsgcsMapper.selectSjFdsgcsByJhAndKc(sjFdsgcs);
if(sjFdsgcs1!=null){
sjFdsgcs1.setZjzh(zjzh);
sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs1);
}else {
sjFdsgcs1=new SjFdsgcs();
sjFdsgcs1.setJh(jh);
sjFdsgcs1.setKc(sjJsjg1.getKc());
sjFdsgcs1.setZjzh(zjzh);
sjFdsgcsMapper.insertSjFdsgcs(sjFdsgcs1);
}
//概要施工参数
SjSggyZjzhcs sjSggyZjzhcs=new SjSggyZjzhcs();
sjSggyZjzhcs.setJh(jh);
sjSggyZjzhcs.setKc(sjJsjg1.getKc());
sjSggyZjzhcs.setJd(ksjs+"-"+sjJsjg1.getJs());
sjSggyZjzhcs.setZtxh(sjZtgjsj1.getZtxh());
sjSggyZjzhcs.setCc(sjZtgjsj1.getZtcc()+"");
sjSggyZjzhcs.setSy(sjZtgjsj1.getPz()+"");
sjSggyZjzhcs.setZjymd(sjZtgjsj1.getZjymd()+"");
sjSggyZjzhcs.setZjpl(sjZtgjsj1.getPl()+"");
sjSggyZjzhcs.setZjby(sjZtgjsj1.getLgby()+"");
sjSggyZjzhcs.setZjjg(zjzh);
if(djjc1!=null){
sjSggyZjzhcs.setCj(djjc1.getCj());
sjSggyZjzhcs.setYj(djjc1.getZtyj()+"");
sjSggyZjzhcs.setZjzy(djjc1.getZy());
sjSggyZjzhcs.setZjzs(djjc1.getZs()+"");
}
sjSggyZjzhcsMapper.deleteSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs);
sjSggyZjzhcsMapper.insertSjSggyZjzhcs(sjSggyZjzhcs);
}
}
if(sjLjtjztList.size()>0){
sjLjtjztMapper.deleteSjLjtjztByJh(jh);
sjLjtjztMapper.insertSjLjtjztBatch(sjLjtjztList);
}
......
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java
......@@ -49,6 +49,8 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
@Autowired
private SjZysxMapper sjZysxMapper;
@Autowired
private SjSggyZjzhcsMapper sjSggyZjzhcsMapper;
/**
......@@ -133,6 +135,23 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
String s = new String(Base64.decode(sjFdsgcs.getZjgccs()));
sjFdsgcs.setZjgccs(s);
}
if(StringUtils.isNotEmpty(sjFdsgcs.getZjzh())){
String s = new String(Base64.decode(sjFdsgcs.getZjzh()));
sjFdsgcs.setZjzh(s);
//
SjSggyZjzhcs sjSggyZjzhcs= new SjSggyZjzhcs();
sjSggyZjzhcs.setJh(sjFdsgcs.getJh());
sjSggyZjzhcs.setKc(sjFdsgcs.getKc());
SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs);
if(sjSggyZjzhcs1!=null){
sjSggyZjzhcs1.setZjjg(s);
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
}
}
if(StringUtils.isNotEmpty(sjFdsgcs.getZjzhzysx())){
String s = new String(Base64.decode(sjFdsgcs.getZjzhzysx()));
sjFdsgcs.setZjzhzysx(s);
}
return sjFdsgcsMapper.updateSjFdsgcs(sjFdsgcs);
}
......
src/main/java/com/ruoyi/project/zjsgfa/service/impl/SjZjcsxxServiceImpl.java
package com.ruoyi.project.zjsgfa.service.impl;
import java.util.List;
import com.ruoyi.project.zjsgfa.domain.SjSggyZjzhcs;
import com.ruoyi.project.zjsgfa.mapper.SjSggyZjzhcsMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.zjsgfa.mapper.SjZjcsxxMapper;
......@@ -19,6 +22,9 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService
@Autowired
private SjZjcsxxMapper sjZjcsxxMapper;
@Autowired
private SjSggyZjzhcsMapper sjSggyZjzhcsMapper;
/**
* 查询设计-钻具参数信息
*
......@@ -64,7 +70,41 @@ public class SjZjcsxxServiceImpl implements ISjZjcsxxService
@Override
public int updateSjZjcsxx(SjZjcsxx sjZjcsxx)
{
return sjZjcsxxMapper.updateSjZjcsxx(sjZjcsxx);
SjSggyZjzhcs sjSggyZjzhcs= new SjSggyZjzhcs();
sjSggyZjzhcs.setJh(sjZjcsxx.getJh());
sjSggyZjzhcs.setKc(sjZjcsxx.getKc());
SjSggyZjzhcs sjSggyZjzhcs1 = sjSggyZjzhcsMapper.selectSjSggyZjzhcsByZjzhcs(sjSggyZjzhcs);
if(sjSggyZjzhcs1!=null){
sjSggyZjzhcs1.setZtxh(sjZjcsxx.getZtxh());
sjSggyZjzhcs1.setCc(sjZjcsxx.getCc()+"");
sjSggyZjzhcs1.setSy(sjZjcsxx.getSy()+"");
sjSggyZjzhcs1.setZjymd(sjZjcsxx.getZjymd()+"");
sjSggyZjzhcs1.setZjpl(sjZjcsxx.getZjpl()+"");
sjSggyZjzhcs1.setCj(sjZjcsxx.getCj());
sjSggyZjzhcs1.setYj(sjZjcsxx.getYj());
sjSggyZjzhcs1.setZjzy(sjZjcsxx.getZjzy());
sjSggyZjzhcs1.setZjzs(sjZjcsxx.getZjzs());
sjSggyZjzhcs1.setZjby(sjZjcsxx.getZjby());
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
}else {
sjSggyZjzhcs1=new SjSggyZjzhcs();
sjSggyZjzhcs1.setJh(sjZjcsxx.getJh());
sjSggyZjzhcs1.setKc(sjZjcsxx.getKc());
sjSggyZjzhcs1.setJd(sjZjcsxx.getJd());
sjSggyZjzhcs1.setZtxh(sjZjcsxx.getZtxh());
sjSggyZjzhcs1.setCc(sjZjcsxx.getCc()+"");
sjSggyZjzhcs1.setSy(sjZjcsxx.getSy()+"");
sjSggyZjzhcs1.setZjymd(sjZjcsxx.getZjymd()+"");
sjSggyZjzhcs1.setZjpl(sjZjcsxx.getZjpl()+"");
sjSggyZjzhcs1.setCj(sjZjcsxx.getCj());
sjSggyZjzhcs1.setYj(sjZjcsxx.getYj());
sjSggyZjzhcs1.setZjzy(sjZjcsxx.getZjzy());
sjSggyZjzhcs1.setZjzs(sjZjcsxx.getZjzs());
sjSggyZjzhcs1.setZjby(sjZjcsxx.getZjby());
sjSggyZjzhcsMapper.updateSjSggyZjzhcs(sjSggyZjzhcs1);
}
int i = sjZjcsxxMapper.updateSjZjcsxx(sjZjcsxx);
return i;
}
/**
......
src/main/java/com/ruoyi/project/zt/domain/Djjc.java
......@@ -85,6 +85,10 @@ public class Djjc {
private String cj;
private Double zs;
private Double ztyj;
private String zy;
//所钻地层
......
src/main/java/com/ruoyi/project/zt/mapper/JsaaMapper.java
......@@ -3,6 +3,7 @@ package com.ruoyi.project.zt.mapper;
import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
import com.ruoyi.project.zt.domain.Jsaa;
import com.ruoyi.project.zt.domain.Jsfa;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -68,4 +69,6 @@ public interface JsaaMapper
List<Jsaa> selectQklist(Jsaa jsaa);
Jsfa selectJsfa(Jsfa jsfa);
}
src/main/resources/mybatis/zjsgfa/SjLjtjztMapper.xml
......@@ -109,4 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteSjLjtjztByJh">
delete from sj_ljtjzt where jh = #{jh}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjSggyZjzhcsMapper.xml
......@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="zjby" column="zjby" />
<result property="gtzj" column="gtzj" />
<result property="zjjg" column="zjjg" />
<result property="kc" column="kc" />
</resultMap>
<sql id="selectSjSggyZjzhcsVo">
select id, jh, jd, ztxh, cj, cc, sy, yj, zjymd, zjzy, zjzs, zjpl, zjby, gtzj, zjjg from sj_sggy_zjzhcs
select id, jh, jd, ztxh, cj, cc, sy, yj, zjymd, zjzy, zjzs, zjpl, zjby, gtzj, zjjg, kc from sj_sggy_zjzhcs
</sql>
<select id="selectSjSggyZjzhcsList" parameterType="SjSggyZjzhcs" resultMap="SjSggyZjzhcsResult">
......@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjby != null and zjby != ''"> and zjby = #{zjby}</if>
<if test="gtzj != null and gtzj != ''"> and gtzj = #{gtzj}</if>
<if test="zjjg != null and zjjg != ''"> and zjjg = #{zjjg}</if>
<if test="kc != null and kc != ''"> and kc = #{kc}</if>
</where>
</select>
......@@ -50,6 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSjSggyZjzhcsVo"/>
where id = #{id}
</select>
<select id="selectSjSggyZjzhcsByZjzhcs" resultType="com.ruoyi.project.zjsgfa.domain.SjSggyZjzhcs">
<include refid="selectSjSggyZjzhcsVo"/>
where jh = #{jh} and kc = #{kc}
</select>
<insert id="insertSjSggyZjzhcs" parameterType="SjSggyZjzhcs" useGeneratedKeys="true" keyProperty="id">
insert into sj_sggy_zjzhcs
......@@ -68,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjby != null">zjby,</if>
<if test="gtzj != null">gtzj,</if>
<if test="zjjg != null">zjjg,</if>
<if test="kc != null">kc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if>
......@@ -84,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjby != null">#{zjby},</if>
<if test="gtzj != null">#{gtzj},</if>
<if test="zjjg != null">#{zjjg},</if>
<if test="kc != null">#{kc},</if>
</trim>
</insert>
......@@ -104,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zjby != null">zjby = #{zjby},</if>
<if test="gtzj != null">gtzj = #{gtzj},</if>
<if test="zjjg != null">zjjg = #{zjjg},</if>
<if test="kc != null">kc = #{kc},</if>
</trim>
where id = #{id}
</update>
......@@ -118,4 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteSjSggyZjzhcsByZjzhcs">
delete from sj_sggy_zjzhcs where jh = #{jh} and jd= #{jd}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjZjcsxxMapper.xml
......@@ -118,4 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteSjZjcsxxByZjcsxx">
delete from sj_zjcsxx where jh = #{jh} and kc = #{kc}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjZtxxMapper.xml
......@@ -68,4 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteSjZtxxByZtxx">
delete from sj_ztxx where jh = #{jh} and kc = #{kc}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zt/DjdcInfoMapper.xml
......@@ -658,7 +658,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
YCMSQK,
ZCMSQK,
Qzyy,
zb,pl,LGBY,cc ztcc,cj
zb,pl,LGBY,cc ztcc,cj,zs,ztyj,zy
from JSBA a
left join jsaa b on a.jh = b.jh
left join (
......@@ -695,7 +695,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
Qzyy,
zzjs,
ROUND(jc / case when (JCSJHJ / 24) =0 then 1 else (JCSJHJ / 24) end , 2) zb
,pl,LGBY,cc,cj
,pl,LGBY,cc,cj,zs,ztyj,zy
from JSHA
order by xh
......
src/main/resources/mybatis/zt/JsaaMapper.xml
......@@ -204,6 +204,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qk != null and qk != ''"> and qk like CONCAT(CONCAT('%', #{qk}), '%')</if>
group by qk order by jsl desc
</select>
<select id="selectJsfa" resultType="com.ruoyi.project.zt.domain.Jsfa">
select * from jsfa where jh=#{jh} and zjjd=#{zjjd} and rownum='1'
</select>
<insert id="insertJsaa" parameterType="Jsaa">
<selectKey keyProperty="jh" resultType="long" order="BEFORE">
......
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