Commit 1db5fb94 by jiang'yun

修改

parent 6ae78efc
......@@ -246,6 +246,9 @@ public class DjdcController {
case "getKjsjList":
//获取
return AjaxResult.success( djdcService.getKjsjList(param));
case "getZsjList":
//获取注水井
return AjaxResult.success( djdcService.getZsjList(param));
default:
return AjaxResult.success();
}
......@@ -317,6 +320,12 @@ public class DjdcController {
ExcelUtil<DjZqsjfx> kssjEx = new ExcelUtil<DjZqsjfx>(DjZqsjfx.class);
kssjEx.exportExcel(response, kjsjList, "Sheet1");
break;
case "exportZsjList":
//导出注释经
List<Zsjfx> zsjList = djdcService.getZsjList(param);
ExcelUtil<Zsjfx> zsjfxExcelUtil = new ExcelUtil<Zsjfx>(Zsjfx.class);
zsjfxExcelUtil.exportExcel(response, zsjList, "Sheet1");
break;
default:
break;
}
......
......@@ -56,6 +56,11 @@ public class CommonParam {
private String[] jhs;
//是否停注
private String sftz;
//注入类型
private String zrlx;
......
package com.ruoyi.project.zt.domain;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
/**
* 注水井
*/
@Data
public class Zsjfx {
//井号
private String jh;
//井号编码(中文井号)
@Excel(name = "井号")
private String jhbm;
//注入类型
@Excel(name = "注入类型")
private String zqlxmc;
//注水层位
@Excel(name = "注水层位")
private String cwmc;
//深度范围
@Excel(name = "深度范围")
private String sdfw;
//井口压力
@Excel(name = "井口压力")
private Double jkyl;
//地层压力
private Double dcyl;
//日注量
@Excel(name = "日注量")
private Double rzl;
//累计注入量
private Double ljzrl;
//注入状态
@Excel(name = "注入状态")
private String zrzt;
//井口距离
@Excel(name = "井口距离")
private Double jkjl;
//井底距离
@Excel(name = "井底距离")
private Double jdjl;
//是否停驻
@Excel(name = "是否停驻")
private String sftz;
}
package com.ruoyi.project.zt.domain;
import lombok.Data;
/**
* 注水井 井组
*/
@Data
public class Zsjjz {
private String jzmc;
private String zqlxdm;
private String zqlxmc;
}
package com.ruoyi.project.zt.domain;
import lombok.Data;
/**
* 注水井日报
*/
@Data
public class Zsjrb {
private String jh;
//注水层位
private String cwmc;
//深度范围
private String sdfw;
//井口压力
private Double yy;
//日注量
private Double pzl;
//生产时长
private Double scsc;
}
......@@ -42,4 +42,13 @@ public interface DjdcInfoMapper {
List<DjZqsjfx> getZqshfxList2(CommonParam param);
List<Zsjfx> getZsjList(CommonParam param);
Zsjrb getZsjrbList(String jh);
Zsjjz getZsjJz(String jh);
}
......@@ -53,4 +53,6 @@ public interface DjdcService {
List<SjDcfxDzfc> getDzfcList2(CommonParam param);
List<DjZqsjfx> getKjsjList(CommonParam param);
List<Zsjfx> getZsjList(CommonParam param);
}
......@@ -16,6 +16,7 @@ import com.ruoyi.project.zt.domain.vo.SjInfo;
import com.ruoyi.project.zt.mapper.*;
import com.ruoyi.project.zt.service.DjdcService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -1744,6 +1745,50 @@ public class DjdcServiceImpl implements DjdcService {
return list;
}
@Override
public List<Zsjfx> getZsjList(CommonParam param) {
//查询邻井
if(StringUtils.isNotEmpty(param.getJh())){
Jsba jsba = jsbaMapper.selectJsbaByJh(param.getJh());
if(jsba!=null){
param.setJkhzb(jsba.getJkhzb());
param.setJkzzb(jsba.getJkzzb());
param.setJdhzb(jsba.getJdhzb());
param.setJdzzb(jsba.getJdzzb());
}else {
return new ArrayList<>();
}
}
List<Zsjfx> list=djdcInfoMapper.getZsjList(param);
//查询注水井情况
for(Zsjfx zsjfx:list){
//查询日报数据
Zsjrb zsjrb=djdcInfoMapper.getZsjrbList(zsjfx.getJh());
if(zsjrb!=null){
BeanUtils.copyProperties(zsjrb,zsjfx);
if(zsjrb.getScsc()>0){
zsjfx.setSftz("否");
}else {
zsjfx.setSftz("是");
}
}
//查询井组
Zsjjz zsjjz =djdcInfoMapper.getZsjJz(zsjfx.getJh());
if (zsjjz!=null){
zsjfx.setZqlxmc(zsjjz.getZqlxmc());
}
}
if(StringUtils.isNotEmpty(param.getSftz())){
list=list.stream().filter(it->param.getSftz().equals(it.getSftz())).collect(Collectors.toList());
}
if(StringUtils.isNotEmpty(param.getZrlx())){
list=list.stream().filter(it->param.getZrlx().equals(it.getZqlxmc())).collect(Collectors.toList());
}
return list;
}
/**
* 计算斜深
* @param a 层位垂深
......
......@@ -613,4 +613,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getZsjList" resultType="com.ruoyi.project.zt.domain.Zsjfx">
SELECT a.jh jhbm,b.jh,b.scfsmc zrzt,
round(power(power(ABS(a.jkhzb - #{jkhzb}
), 2) + power(ABS(a.jkzzb - #{jkzzb}), 2), 0.5), 2) as jkjl,
round(power(power(ABS(a.jdhzb - #{jdhzb}
), 2) + power(ABS(a.jdzzb - #{jdzzb}), 2), 0.5), 2) as jdjl
FROM JSBA
a LEFT JOIN V_ODS_JCXX_DJKFJCXX@ZS b on a.jh= b.jhbm
WHERE 1 = 1
and a.jh not like '%侧%'
and ABS(a.jkhzb - #{jkhzb}) &lt; #{jl}
AND ABS(a.jkzzb - #{jkzzb}) &lt; #{jl}
order by jkjl asc
</select>
<select id="getZsjrbList" resultType="com.ruoyi.project.zt.domain.Zsjrb">
SELECT jh,cwmc,scjdds|| '-' ||scjddsa sdfw,Nvl(yy,0)yy,nvl(pzl,0)pzl,nvl(scsc,0)scsc FROM (select * from V_ODS_CYQ_SCSJ_ZSSCSJ@ZS t where jh=#{jh} order by t.RQ desc )a WHERE ROWNUM &lt;=1
</select>
<select id="getZsjJz" resultType="com.ruoyi.project.zt.domain.Zsjjz">
SELECT *FROM( select jzmc,t.ZQLXMC,t.ZQLXDM
from V_ODS_CYQ_JCXX_ZQJZJCXX@ZS t where t.jzmc like CONCAT(#{jh}, '%') )a WHERE ROWNUM &lt;=1
</select>
</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