Skip to content

Z
zjsgfa_mysql
Commit 99e3adff by jiang'yun
Options

修改

parent bc24c0d0
Showing with 724 additions and 40 deletions
src/main/java/com/zjsgfa/project/zjsgfa/controller/CxtjController.java 0 → 100644
package com.zjsgfa.project.zjsgfa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zjsgfa.common.utils.SecurityUtils;
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.zjsgfa.framework.aspectj.lang.annotation.Log;
import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
import com.zjsgfa.project.zjsgfa.domain.Cxtj;
import com.zjsgfa.project.zjsgfa.service.ICxtjService;
import com.zjsgfa.framework.web.controller.BaseController;
import com.zjsgfa.framework.web.domain.AjaxResult;
import com.zjsgfa.common.utils.poi.ExcelUtil;
import com.zjsgfa.framework.web.page.TableDataInfo;
/**
* 查询条件Controller
*
* @author ruoyi
* @date 2025-09-12
*/
@RestController
@RequestMapping("/system/cxtj")
public class CxtjController extends BaseController
{
@Autowired
private ICxtjService cxtjService;
/**
* 查询查询条件列表
*/
//@PreAuthorize("@ss.hasPermi('system:cxtj:list')")
@GetMapping("/list")
public TableDataInfo list(Cxtj cxtj)
{
startPage();
cxtj.setCreatedBy(SecurityUtils.getUsername());
List<Cxtj> list = cxtjService.selectCxtjList(cxtj);
return getDataTable(list);
}
/**
* 导出查询条件列表
*/
//@PreAuthorize("@ss.hasPermi('system:cxtj:export')")
@Log(title = "查询条件", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Cxtj cxtj)
{
List<Cxtj> list = cxtjService.selectCxtjList(cxtj);
ExcelUtil<Cxtj> util = new ExcelUtil<Cxtj>(Cxtj.class);
util.exportExcel(response, list, "查询条件数据");
}
/**
* 获取查询条件详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:cxtj:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(cxtjService.selectCxtjById(id));
}
/**
* 新增查询条件
*/
//@PreAuthorize("@ss.hasPermi('system:cxtj:add')")
@Log(title = "查询条件", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Cxtj cxtj)
{
return toAjax(cxtjService.insertCxtj(cxtj));
}
/**
* 修改查询条件
*/
//@PreAuthorize("@ss.hasPermi('system:cxtj:edit')")
@Log(title = "查询条件", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Cxtj cxtj)
{
return toAjax(cxtjService.updateCxtj(cxtj));
}
/**
* 删除查询条件
*/
//@PreAuthorize("@ss.hasPermi('system:cxtj:remove')")
@Log(title = "查询条件", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(cxtjService.deleteCxtjByIds(ids));
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjDjjcController.java
......@@ -1420,7 +1420,7 @@ public class SjDjjcController extends BaseController
//质量要求 中靶要求-定向井end---------------------------------------------------
//质量要求 质量要求---------------------------------------------------
List<SjZlyqXx> sjZlyqXxList =new ArrayList<>();
for(int i=3;i<=lastRowNum;i++){
for(int i=1;i<=lastRowNum;i++){
row = sheet.getRow(i);
if(row==null){
continue;
......@@ -1794,6 +1794,17 @@ public class SjDjjcController extends BaseController
param.setJh(jh);
List<SjDcfxDzfc> dzfcList = djdcService.getDzfcList2(param);
List<SjFdfx> sjFdfxList=new ArrayList<>();
double ksjs= 0;
for (int i = 0; i < sjJsjgList.size(); i++) {
if (i == 0) {
ksjs = 0;
} else {
//上一次的垂深
ksjs = sjJsjgList.get(i - 1).getJs();
}
}
for (SjDcfxDzfc sjDcfxDzfc : dzfcList){
SjFdfx sjFdfx = new SjFdfx();
BeanUtils.copyProperties(sjDcfxDzfc,sjFdfx);
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjFdfxController.java
......@@ -101,4 +101,12 @@ public class SjFdfxController extends BaseController
{
return toAjax(sjFdfxService.deleteSjFdfxByIds(ids));
}
@PostMapping("/pladd")
public AjaxResult pladd(@RequestBody SjFdfx sjFdfx)
{
return toAjax(sjFdfxService.pladd(sjFdfx));
}
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/Cxtj.java 0 → 100644
package com.zjsgfa.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
import com.zjsgfa.framework.web.domain.BaseEntity;
import lombok.Data;
/**
* 查询条件对象 cxtj
*
* @author ruoyi
* @date 2025-09-12
*/
@Data
public class Cxtj extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 查询条件名称 */
@Excel(name = "查询条件名称")
private String cxtjmc;
/** 区块 */
@Excel(name = "区块")
private String qk;
/** 井号（多个） */
@Excel(name = "井号", readConverterExp = "多=个")
private String jh;
/** 备注 */
@Excel(name = "备注")
private String bz;
/** 创建人 */
@Excel(name = "创建人")
private String createdBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime;
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjFdfx.java
......@@ -5,6 +5,9 @@ import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
import com.zjsgfa.framework.web.domain.BaseEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 设计-分段分析对象 sj_fdfx
*
......@@ -23,6 +26,8 @@ public class SjFdfx extends BaseEntity
@Excel(name = "主表id")
private Long zbid;
private String kc;
/** 井号 */
@Excel(name = "井号")
private String jh;
......@@ -67,6 +72,8 @@ public class SjFdfx extends BaseEntity
@Excel(name = "划分依据")
private String hfyj;
private List<SjFdfx> list=new ArrayList<>();
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/CxtjMapper.java 0 → 100644
package com.zjsgfa.project.zjsgfa.mapper;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.Cxtj;
/**
* 查询条件Mapper接口
*
* @author ruoyi
* @date 2025-09-12
*/
public interface CxtjMapper
{
/**
* 查询查询条件
*
* @param id 查询条件主键
* @return 查询条件
*/
public Cxtj selectCxtjById(Long id);
/**
* 查询查询条件列表
*
* @param cxtj 查询条件
* @return 查询条件集合
*/
public List<Cxtj> selectCxtjList(Cxtj cxtj);
/**
* 新增查询条件
*
* @param cxtj 查询条件
* @return 结果
*/
public int insertCxtj(Cxtj cxtj);
/**
* 修改查询条件
*
* @param cxtj 查询条件
* @return 结果
*/
public int updateCxtj(Cxtj cxtj);
/**
* 删除查询条件
*
* @param id 查询条件主键
* @return 结果
*/
public int deleteCxtjById(Long id);
/**
* 批量删除查询条件
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCxtjByIds(Long[] ids);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ICxtjService.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.Cxtj;
/**
* 查询条件Service接口
*
* @author ruoyi
* @date 2025-09-12
*/
public interface ICxtjService
{
/**
* 查询查询条件
*
* @param id 查询条件主键
* @return 查询条件
*/
public Cxtj selectCxtjById(Long id);
/**
* 查询查询条件列表
*
* @param cxtj 查询条件
* @return 查询条件集合
*/
public List<Cxtj> selectCxtjList(Cxtj cxtj);
/**
* 新增查询条件
*
* @param cxtj 查询条件
* @return 结果
*/
public int insertCxtj(Cxtj cxtj);
/**
* 修改查询条件
*
* @param cxtj 查询条件
* @return 结果
*/
public int updateCxtj(Cxtj cxtj);
/**
* 批量删除查询条件
*
* @param ids 需要删除的查询条件主键集合
* @return 结果
*/
public int deleteCxtjByIds(Long[] ids);
/**
* 删除查询条件信息
*
* @param id 查询条件主键
* @return 结果
*/
public int deleteCxtjById(Long id);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/ISjFdfxService.java
......@@ -58,4 +58,7 @@ public interface ISjFdfxService
* @return 结果
*/
public int deleteSjFdfxById(Long id);
int pladd(SjFdfx sjFdfx);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/CxtjServiceImpl.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.Date;
import java.util.List;
import com.zjsgfa.common.utils.DateUtils;
import com.zjsgfa.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.CxtjMapper;
import com.zjsgfa.project.zjsgfa.domain.Cxtj;
import com.zjsgfa.project.zjsgfa.service.ICxtjService;
/**
* 查询条件Service业务层处理
*
* @author ruoyi
* @date 2025-09-12
*/
@Service
public class CxtjServiceImpl implements ICxtjService
{
@Autowired
private CxtjMapper cxtjMapper;
/**
* 查询查询条件
*
* @param id 查询条件主键
* @return 查询条件
*/
@Override
public Cxtj selectCxtjById(Long id)
{
return cxtjMapper.selectCxtjById(id);
}
/**
* 查询查询条件列表
*
* @param cxtj 查询条件
* @return 查询条件
*/
@Override
public List<Cxtj> selectCxtjList(Cxtj cxtj)
{
return cxtjMapper.selectCxtjList(cxtj);
}
/**
* 新增查询条件
*
* @param cxtj 查询条件
* @return 结果
*/
@Override
public int insertCxtj(Cxtj cxtj)
{
cxtj.setCreatedBy(SecurityUtils.getUsername());
cxtj.setCreatedTime(new Date());
return cxtjMapper.insertCxtj(cxtj);
}
/**
* 修改查询条件
*
* @param cxtj 查询条件
* @return 结果
*/
@Override
public int updateCxtj(Cxtj cxtj)
{
cxtj.setUpdateTime(DateUtils.getNowDate());
cxtj.setUpdateBy(SecurityUtils.getUsername());
return cxtjMapper.updateCxtj(cxtj);
}
/**
* 批量删除查询条件
*
* @param ids 需要删除的查询条件主键
* @return 结果
*/
@Override
public int deleteCxtjByIds(Long[] ids)
{
return cxtjMapper.deleteCxtjByIds(ids);
}
/**
* 删除查询条件信息
*
* @param id 查询条件主键
* @return 结果
*/
@Override
public int deleteCxtjById(Long id)
{
return cxtjMapper.deleteCxtjById(id);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdfxServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.zjsgfa.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.SjFdfxMapper;
......@@ -90,4 +95,39 @@ public class SjFdfxServiceImpl implements ISjFdfxService
{
return sjFdfxMapper.deleteSjFdfxById(id);
}
@Override
public int pladd(SjFdfx sjFdfx) {
List<SjFdfx> list = sjFdfx.getList();
if(list.size()==0){
return 0;
}
List<SjFdfx> collect = list.stream().filter(it -> StringUtils.isEmpty(it.getGcdzfdid())).collect(Collectors.toList());
Map<String, List<SjFdfx>> groupedByList = list.stream().filter(it -> StringUtils.isNotEmpty(it.getGcdzfdid())).collect(Collectors.toList()).stream()
.collect(Collectors.groupingBy(SjFdfx::getGcdzfdid));
List<SjFdfx> addList =new ArrayList<>();
for (Map.Entry<String, List<SjFdfx>> entry : groupedByList.entrySet()) {
List<SjFdfx> sjFdfxList = entry.getValue();
SjFdfx sjFdfx1 = sjFdfxList.stream().filter(item -> StringUtils.isNotEmpty(item.getGcdzfd())).findFirst().orElse(null);
String gcdzfd="";
if(sjFdfx1!=null){
gcdzfd= sjFdfx1.getGcdzfd();
}
SjFdfx sjFdfx2 = sjFdfxList.stream().filter(item -> StringUtils.isNotEmpty(item.getHfyj())).findFirst().orElse(null);
String fdyj="";
if(sjFdfx2!=null){
fdyj= sjFdfx2.getHfyj();
}
for(SjFdfx item:sjFdfxList){
item.setGcdzfd(gcdzfd);
item.setHfyj(fdyj);
addList.add(item);
}
}
addList.addAll(collect);
//删除数据
sjFdfxMapper.deleteSjFdfxByZbid(list.get(0).getZbid());
return sjFdfxMapper.insertSjFdfxBatch(addList);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjLjjwServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.SjLjjwMapper;
......@@ -93,7 +96,24 @@ public class SjLjjwServiceImpl implements ISjLjjwService
@Override
public int insertSjLjjwBatch(List<SjLjjw> list) {
return sjLjjwMapper.insertSjLjjwBatch(list);
String jh = list.get(0).getJh();
SjLjjw sjLjjw=new SjLjjw();
sjLjjw.setJh(jh);
List<SjLjjw> sjLjjws = sjLjjwMapper.selectSjLjjwList(sjLjjw);
Set<String> jhSet = sjLjjws.stream()
.map(SjLjjw::getLjjh) // 假设getJh()是获取井号的方法
.collect(Collectors.toSet());
List<SjLjjw> difference = list.stream()
.filter(item -> !jhSet.contains(item.getLjjh()))
.collect(Collectors.toList());
if(difference.size()>0){
int i = sjLjjwMapper.insertSjLjjwBatch(difference);
return i;
}else {
return 1;
}
}
@Override
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjZysxServiceImpl.java
......@@ -58,8 +58,11 @@ public class SjZysxServiceImpl implements ISjZysxService
@Override
public int insertSjZysx(SjZysx sjZysx)
{
if(StringUtils.isNotEmpty(sjZysx.getZysx())){
sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx()), StandardCharsets.UTF_8));
String lb = sjZysx.getLb();
if("喷漏卡塌".equals(lb) || "特殊岩性风险".equals(lb)){
if(StringUtils.isNotEmpty(sjZysx.getZysx())){
sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx()), StandardCharsets.UTF_8));
}
}
return sjZysxMapper.insertSjZysx(sjZysx);
}
......
src/main/java/com/zjsgfa/project/zt/controller/DjdcController.java
......@@ -136,8 +136,13 @@ public class DjdcController {
map.put("jdjl","井底距离");
map.put("jdzjl","井底纵距离");
map.put("jdhjl","井底横距离");
List<Ljjw> ljjwList = djdcService.getLjjwList(param);
AjaxResult result = djdcService.getLjjwList(param);
// 从 AjaxResult 中提取数据并转换为 List<Ljjw>
Object data = result.get("data"); // 或者使用 result.getData()，取决于 AjaxResult 的具体实现
List<Ljjw> ljjwList = (List<Ljjw>) data;
String md = listToMarkdownTable(ljjwList);
return md;
// return AjaxResult.success("",md,map);
case "getLjjwList2":
......@@ -161,8 +166,8 @@ public class DjdcController {
map.put("jdjl","井底距离");
map.put("jdzjl","井底纵距离");
map.put("jdhjl","井底横距离");
List<Ljjw> ljjwList2= djdcService.getLjjwList(param);
return AjaxResult.success(ljjwList2);
// List<Ljjw> ljjwList2= djdcService.getLjjwList(param);
return djdcService.getLjjwList(param);
case "getJsqaList":
//获取复杂情况
map.put("jh","井号");
......@@ -246,6 +251,9 @@ public class DjdcController {
case "getZsjList":
//获取注水井
return AjaxResult.success( djdcService.getZsjList(param));
case "getGzbjList":
//获取高指标井
return AjaxResult.success( djdcService.getGzbjList(param));
default:
return AjaxResult.success();
}
......@@ -264,9 +272,11 @@ public class DjdcController {
switch (path) {
case "exportLjjw":
//导出邻井查询
List<Ljjw> ljjwList2 = djdcService.getLjjwList(param);
AjaxResult result = djdcService.getLjjwList(param);
Object data = result.get("data");
List<Ljjw> ljjwList = (List<Ljjw>) data;
ExcelUtil<Ljjw> util = new ExcelUtil<Ljjw>(Ljjw.class);
util.exportExcel(response, ljjwList2, "Sheet1");
util.exportExcel(response, ljjwList, "Sheet1");
break;
case "exportZqshfx":
//导出周期分析
......
src/main/java/com/zjsgfa/project/zt/domain/CommonParam.java
......@@ -61,6 +61,11 @@ public class CommonParam {
//注入类型
private String zrlx;
//开次
private String kc;
//钻头直径
private String ztzj;
......
src/main/java/com/zjsgfa/project/zt/domain/Jsqa.java
package com.zjsgfa.project.zt.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
......@@ -11,8 +13,12 @@ public class Jsqa {
private String jh;
private Integer fzbh;
private String fzqk;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date fsrq;
private String fssj;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date jcrq;
private String jcsj;
private Double sssj;
......
src/main/java/com/zjsgfa/project/zt/domain/LjGzbj.java 0 → 100644
package com.zjsgfa.project.zt.domain;
import lombok.Data;
/**
* 高指标井
*/
@Data
public class LjGzbj {
//jh
private String jh;
//区块
private String qk;
//开次
private String kc;
//钻头直径
private String ztzj;
//完钻井深
private Double js;
//开始井深
private Double ksjs;
//钻井深度
private String jd;
//钻井时间（h）
private Double sjts;
//钻速（m/h）
private Double zs;
}
src/main/java/com/zjsgfa/project/zt/mapper/DjdcInfoMapper.java
......@@ -53,4 +53,6 @@ public interface DjdcInfoMapper {
Djjc selectZtsj(Djjc djjc);
List<LjGzbj> getGzbjList(CommonParam param);
}
src/main/java/com/zjsgfa/project/zt/service/DjdcService.java
package com.zjsgfa.project.zt.service;
import com.zjsgfa.framework.web.domain.AjaxResult;
import com.zjsgfa.project.zjsgfa.domain.SjDcfxDzfc;
import com.zjsgfa.project.zt.domain.*;
......@@ -21,7 +22,7 @@ public interface DjdcService {
List<DjZjzhfx> getZjzhfxList(CommonParam param);
List<Ljjw> getLjjwList(CommonParam param);
AjaxResult getLjjwList(CommonParam param);
List<Jsfa> getJsfaList(CommonParam param);
......@@ -57,4 +58,5 @@ public interface DjdcService {
Djjc selectZtsj(Djjc djjc);
List<LjGzbj> getGzbjList(CommonParam param);
}
src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java
......@@ -9,6 +9,7 @@ import com.google.gson.stream.JsonReader;
import com.zjsgfa.common.utils.DateUtils;
import com.zjsgfa.framework.aspectj.lang.annotation.DataSource;
import com.zjsgfa.framework.aspectj.lang.enums.DataSourceType;
import com.zjsgfa.framework.web.domain.AjaxResult;
import com.zjsgfa.project.zjsgfa.domain.*;
import com.zjsgfa.project.zjsgfa.mapper.*;
import com.zjsgfa.project.zt.domain.*;
......@@ -810,19 +811,41 @@ public class DjdcServiceImpl implements DjdcService {
}
@Override
public List<Ljjw> getLjjwList(CommonParam param) {
public AjaxResult getLjjwList(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());
if(jsba.getJkhzb()!=null && jsba.getJkhzb()!=null){
param.setJkhzb(jsba.getJkhzb());
param.setJkzzb(jsba.getJkzzb());
}else {
if(jsba.getJdhzb()!=null && jsba.getJdhzb()!=null){
param.setJkhzb(jsba.getJdhzb());
param.setJkzzb(jsba.getJdhzb());
}else {
return AjaxResult.error("未查询到井坐标信息");
}
}
if(jsba.getJdhzb()!=null && jsba.getJdhzb()!=null){
param.setJdhzb(jsba.getJdhzb());
param.setJdzzb(jsba.getJdzzb());
}else {
param.setJdhzb(jsba.getJkhzb());
param.setJdzzb(jsba.getJkzzb());
}
}else {
return new ArrayList<>();
return AjaxResult.error("未查询到井数据");
}
}
return djdcInfoMapper.getLjjwList(param);
List<Ljjw> ljjwList = djdcInfoMapper.getLjjwList(param);
return AjaxResult.success(ljjwList);
}
@Override
......@@ -1883,6 +1906,11 @@ public class DjdcServiceImpl implements DjdcService {
return djdcInfoMapper.selectZtsj(djjc);
}
@Override
public List<LjGzbj> getGzbjList(CommonParam param) {
return djdcInfoMapper.getGzbjList(param);
}
/**
* 计算斜深
* @param a 层位垂深
......
src/main/resources/mybatis/zjsgfa/CxtjMapper.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.zjsgfa.project.zjsgfa.mapper.CxtjMapper">
<resultMap type="Cxtj" id="CxtjResult">
<result property="id" column="id" />
<result property="cxtjmc" column="cxtjmc" />
<result property="qk" column="qk" />
<result property="jh" column="jh" />
<result property="bz" column="bz" />
<result property="createdBy" column="created_by" />
<result property="createdTime" column="created_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectCxtjVo">
select id, cxtjmc, qk, jh, bz, created_by, created_time, update_by, update_time from cxtj
</sql>
<select id="selectCxtjList" parameterType="Cxtj" resultMap="CxtjResult">
<include refid="selectCxtjVo"/>
<where>
<if test="cxtjmc != null and cxtjmc != ''"> and cxtjmc = #{cxtjmc}</if>
<if test="qk != null and qk != ''"> and qk = #{qk}</if>
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="bz != null and bz != ''"> and bz = #{bz}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if>
</where>
order by created_time desc
</select>
<select id="selectCxtjById" parameterType="Long" resultMap="CxtjResult">
<include refid="selectCxtjVo"/>
where id = #{id}
</select>
<insert id="insertCxtj" parameterType="Cxtj" useGeneratedKeys="true" keyProperty="id">
insert into cxtj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="cxtjmc != null">cxtjmc,</if>
<if test="qk != null">qk,</if>
<if test="jh != null">jh,</if>
<if test="bz != null">bz,</if>
<if test="createdBy != null">created_by,</if>
<if test="createdTime != null">created_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cxtjmc != null">#{cxtjmc},</if>
<if test="qk != null">#{qk},</if>
<if test="jh != null">#{jh},</if>
<if test="bz != null">#{bz},</if>
<if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateCxtj" parameterType="Cxtj">
update cxtj
<trim prefix="SET" suffixOverrides=",">
<if test="cxtjmc != null">cxtjmc = #{cxtjmc},</if>
<if test="qk != null">qk = #{qk},</if>
<if test="jh != null">jh = #{jh},</if>
<if test="bz != null">bz = #{bz},</if>
<if test="createdBy != null">created_by = #{createdBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteCxtjById" parameterType="Long">
delete from cxtj where id = #{id}
</delete>
<delete id="deleteCxtjByIds" parameterType="String">
delete from cxtj 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/SjFdfxMapper.xml
......@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="gcdzfd" column="gcdzfd" />
<result property="hfyjid" column="hfyjid" />
<result property="hfyj" column="hfyj" />
<result property="kc" column="kc" />
</resultMap>
<sql id="selectSjFdfxVo">
select id, zbid, jh, dzfc, cs, xs, yxts, yqsts, gzts, gcdzfdid, gcdzfd, hfyjid, hfyj from sj_fdfx
select id, zbid, jh,kc, dzfc, cs, xs, yxts, yqsts, gzts, gcdzfdid, gcdzfd, hfyjid, hfyj from sj_fdfx
</sql>
<select id="selectSjFdfxList" parameterType="SjFdfx" resultMap="SjFdfxResult">
......@@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="zbid != null "> and zbid = #{zbid}</if>
<if test="jh != null and jh != ''"> and jh = #{jh}</if>
<if test="kc != null and kc != ''"> and kc = #{kc}</if>
<if test="dzfc != null and dzfc != ''"> and dzfc = #{dzfc}</if>
<if test="cs != null "> and cs = #{cs}</if>
<if test="xs != null "> and xs = #{xs}</if>
......@@ -40,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="hfyjid != null and hfyjid != ''"> and hfyjid = #{hfyjid}</if>
<if test="hfyj != null and hfyj != ''"> and hfyj = #{hfyj}</if>
</where>
order by xs
</select>
<select id="selectSjFdfxById" parameterType="Long" resultMap="SjFdfxResult">
......@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="gcdzfd != null">gcdzfd,</if>
<if test="hfyjid != null">hfyjid,</if>
<if test="hfyj != null">hfyj,</if>
<if test="kc != null">kc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="zbid != null">#{zbid},</if>
......@@ -76,12 +80,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="gcdzfd != null">#{gcdzfd},</if>
<if test="hfyjid != null">#{hfyjid},</if>
<if test="hfyj != null">#{hfyj},</if>
<if test="kc != null">#{kc},</if>
</trim>
</insert>
<insert id="insertSjFdfxBatch">
insert into sj_fdfx (zbid,jh,dzfc,cs,xs,yxts,yqsts,gzts,gcdzfdid,gcdzfd,hfyjid,hfyj) values
insert into sj_fdfx (zbid,jh,dzfc,cs,xs,yxts,yqsts,gzts,gcdzfdid,gcdzfd,hfyjid,hfyj,kc) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.zbid},#{item.jh},#{item.dzfc},#{item.cs},#{item.xs},#{item.yxts},#{item.yqsts},#{item.gzts},#{item.gcdzfdid},#{item.gcdzfd},#{item.hfyjid},#{item.hfyj})
(#{item.zbid},#{item.jh},#{item.dzfc},#{item.cs},#{item.xs},#{item.yxts},#{item.yqsts},#{item.gzts},#{item.gcdzfdid},#{item.gcdzfd},#{item.hfyjid},#{item.hfyj},#{item.kc})
</foreach>
</insert>
......@@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="gcdzfd != null">gcdzfd = #{gcdzfd},</if>
<if test="hfyjid != null">hfyjid = #{hfyjid},</if>
<if test="hfyj != null">hfyj = #{hfyj},</if>
<if test="kc != null">kc = #{kc},</if>
</trim>
where id = #{id}
</update>
......
src/main/resources/mybatis/zt/DjdcInfoMapper.xml
......@@ -367,14 +367,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
kc.kc,
zjzq.wjzq,
zjzq.zjzq,
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,
ABS(a.jkzzb - ${jkzzb}) as jkzjl,
ABS(a.jkhzb - ${jkhzb}) as jkhjl,
ABS(a.jdzzb - ${jdzzb}) as jdzjl,
ABS(a.jdhzb - ${jdhzb}) as jdhjl
round(power(power(a.jkhzb - ${jkhzb}
, 2) + power(a.jkzzb - ${jkzzb}, 2), 0.5), 2) as jkjl,
round(power(power(a.jdhzb - ${jdhzb}
, 2) + power(a.jdzzb - ${jdzzb}, 2), 0.5), 2) as jdjl,
a.jkzzb - ${jkzzb} as jkzjl,
a.jkhzb - ${jkhzb} as jkhjl,
a.jdzzb - ${jdzzb} as jdzjl,
a.jdhzb - ${jdhzb} as jdhjl
FROM JSBA a
left join jsaa b
on a.jh = b.jh
......@@ -397,8 +397,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE 1 = 1
and a.jh not like '%侧%'
and ABS(a.jdhzb - #{jdhzb}) &lt; #{jl}
AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl}
and a.jdhzb - #{jdhzb} &lt; #{jl}
AND a.jdzzb - #{jdzzb} &lt; #{jl}
and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
<if test="qk!=null and qk!=''">
......@@ -436,14 +436,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
kc.kc,
zjzq.wjzq,
zjzq.zjzq,
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,
ABS(a.jkzzb - ${jkzzb}) as jkzjl,
ABS(a.jkhzb - ${jkhzb}) as jkhjl,
ABS(a.jdzzb - ${jdzzb}) as jdzjl,
ABS(a.jdhzb - ${jdhzb}) as jdhjl
round(power(power(a.jkhzb - ${jkhzb}
, 2) + power(a.jkzzb - ${jkzzb}, 2), 0.5), 2) as jkjl,
round(power(power(a.jdhzb - ${jdhzb}
, 2) + power(a.jdzzb - ${jdzzb}, 2), 0.5), 2) as jdjl,
a.jkzzb - ${jkzzb} as jkzjl,
a.jkhzb - ${jkhzb} as jkhjl,
a.jdzzb - ${jdzzb} as jdzjl,
a.jdhzb - ${jdhzb} as jdhjl
FROM JSBA a
left join jsaa b
on a.jh = b.jh
......@@ -465,8 +465,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE 1 = 1
and a.jh not like '%侧%'
and ABS(a.jdhzb - #{jdhzb}) &lt; #{jl}
AND ABS(a.jdzzb - #{jdzzb}) &lt; #{jl}
and a.jdhzb - #{jdhzb} &lt; #{jl}
AND a.jdzzb - #{jdzzb} &lt; #{jl}
and TO_CHAR(b.wjrq, 'YYYY') between #{wjsjks} and #{wjsjjs}
<if test="qk!=null and qk!=''">
......@@ -704,4 +704,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where 1=1
and a.jh=#{jh} and kc =#{kc} and c.jd=#{jd} and JXZS=#{jxzs}
</select>
<select id="getGzbjList" resultType="com.zjsgfa.project.zt.domain.LjGzbj">
select a.jh,
a.QK,
t.*,
ROUND(NVL(c.SJTS, 0) * 24, 2)sjts,
case when c.SJTS is not null then ROUND((nvl(JD2,0)-nvl(JD1,0)) / (ROUND(NVL(c.SJTS,0)*24,2)),2) else 0 end zs
from JSaa a
left join (SELECT jh,
ztzj,
kc,
(CASE WHEN kc = 1 THEN 0 ELSE LAG_JS END) ksjs,
js,
CONCAT(CASE WHEN kc = 1 THEN '0-' ELSE LAG_JS || '-' END, JS) AS jd
FROM (SELECT jh,
ZTZJ,
ROW_NUMBER() OVER (PARTITION BY jh ORDER BY js) AS kc, JS,
LAG(JS, 1, 0) OVER (PARTITION BY jh ORDER BY js) AS LAG_JS
FROM JSDB) t) t on a.JH = t.JH
left join (select *
from JSTA
where NVL(JD1, 0) != NVL(JD2,0)) c on a.JH = c.JH and t.js = c.JD2
where
1=1
<if test="qk!=null and qk!=''">
and a.qk like CONCAT(#{qk}, '%')
</if>
<if test="kc!=null and kc !=''">
and t.kc= #{kc}
</if>
<if test="ztzj!=null and ztzj !=''">
and t.ZTZJ=#{ztzj}
</if>
order by zs desc
</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