Commit d94ef302 authored by renchao's avatar renchao

炮孔设计模块,设计爆区爆破量模块代码编写

parent cf6f5aa8
...@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.controller; ...@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.controller;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery; import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService; import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
import cn.wise.sc.acquisition.business.util.DateUtil;
import cn.wise.sc.acquisition.business.wrapper.page.Query; import cn.wise.sc.acquisition.business.wrapper.page.Query;
import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.api.R;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -20,7 +21,7 @@ import java.time.LocalDateTime; ...@@ -20,7 +21,7 @@ import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 前端控制器 * 前端控制器
* </p> * </p>
* *
* @author renchao * @author renchao
...@@ -33,6 +34,7 @@ public class TProcessesBlastdesignHoleController { ...@@ -33,6 +34,7 @@ public class TProcessesBlastdesignHoleController {
@Autowired @Autowired
private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService; private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService;
/** /**
* 根据条件查询炮孔设计 分页 * 根据条件查询炮孔设计 分页
* *
...@@ -40,13 +42,13 @@ public class TProcessesBlastdesignHoleController { ...@@ -40,13 +42,13 @@ public class TProcessesBlastdesignHoleController {
*/ */
@ApiOperation(value = "根据条件查询炮孔设计 可分页") @ApiOperation(value = "根据条件查询炮孔设计 可分页")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ApiImplicitParam(name = "designDate", value = "设计时间", paramType = "query", dataType = "LocalDateTime") @ApiImplicitParam(name = "designDate", value = "设计时间", paramType = "query", dataType = "String")
}) })
@RequestMapping(value = "/getPage", method = RequestMethod.GET) @RequestMapping(value = "/getPage", method = RequestMethod.GET)
public R getPage(LocalDateTime designDate,Query query) { public R getPage(String designDate, Query query) {
TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery(); TProcessesBlastdesignHoleQuery param = new TProcessesBlastdesignHoleQuery();
param.setDesignDate(designDate); param.setDesignDate(DateUtil.strToTime(designDate));
return itProcessesBlastdesignHoleService.getPage(param,query); return itProcessesBlastdesignHoleService.getPage(param, query);
} }
......
...@@ -189,7 +189,8 @@ public class ProjectEnum { ...@@ -189,7 +189,8 @@ public class ProjectEnum {
DESIGN_DATE(1, "DesignDate","设计时间"), DESIGN_DATE(1, "DesignDate","设计时间"),
STOPE_NAME(2, "StopeName","采区名称"), STOPE_NAME(2, "StopeName","采区名称"),
STEP_NAME(3, "StepName","平台名称"), STEP_NAME(3, "StepName","平台名称"),
BLAST_AREA_NAME(4, "BlastAreaName","爆区名称"); BLAST_AREA_NAME(4, "BlastAreaName","爆区名称"),
DEPTH(5, "Depth","孔深");
// 成员变量 // 成员变量
private int value; private int value;
......
...@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List;
/** /**
* <p> * <p>
* Mapper 接口 * Mapper 接口
* </p> * </p>
* *
* @author renchao * @author renchao
...@@ -20,4 +22,6 @@ public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBl ...@@ -20,4 +22,6 @@ public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBl
Page<TProcessesBlastdesignHoleVo> getPage(Page<TProcessesBlastdesignHole> page, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper); Page<TProcessesBlastdesignHoleVo> getPage(Page<TProcessesBlastdesignHole> page, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
} }
...@@ -47,4 +47,16 @@ ...@@ -47,4 +47,16 @@
</where> </where>
</select> </select>
<!-- 获取所有getByQuery列表 -->
<select id="getSumByCondition" resultType="Double">
SELECT
sum(${condition})
FROM T_Processes_BlastDesign_Hole a
<include refid="TProcessesBlastdesignHoleJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>
package cn.wise.sc.acquisition.business.model.vo; package cn.wise.sc.acquisition.business.model.vo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
...@@ -19,7 +18,7 @@ public class TProcessesBlastdesignHoleResultVo<T> { ...@@ -19,7 +18,7 @@ public class TProcessesBlastdesignHoleResultVo<T> {
/** /**
* 设计孔深合计 * 设计孔深合计
*/ */
private Integer depthCount; private Double depthSum;
/** /**
* 分页返回数据 * 分页返回数据
...@@ -31,8 +30,8 @@ public class TProcessesBlastdesignHoleResultVo<T> { ...@@ -31,8 +30,8 @@ public class TProcessesBlastdesignHoleResultVo<T> {
} }
public TProcessesBlastdesignHoleResultVo(Page<T> data, Integer depthCount) { public TProcessesBlastdesignHoleResultVo(Page<T> data, Double depthSum) {
this.depthCount = depthCount; this.depthSum = depthSum;
this.data = data; this.data = data;
} }
} }
...@@ -6,6 +6,7 @@ import cn.wise.sc.acquisition.business.enumation.ProjectEnum; ...@@ -6,6 +6,7 @@ import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper; import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery; import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery; import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignVolumeQuery;
import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleResultVo;
import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo; import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService; import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService; import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
...@@ -13,6 +14,7 @@ import cn.wise.sc.acquisition.business.util.DateUtil; ...@@ -13,6 +14,7 @@ import cn.wise.sc.acquisition.business.util.DateUtil;
import cn.wise.sc.acquisition.business.wrapper.page.Query; import cn.wise.sc.acquisition.business.wrapper.page.Query;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -55,11 +57,16 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -55,11 +57,16 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
.ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate())) .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()))
.le(stringBuilder.toString(), DateUtil.getEndTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate())); .le(stringBuilder.toString(), DateUtil.getEndTimeStr(tProcessesBlastdesignHoleQuery.getDesignDate()));
} }
//查询 //查询分页数据
Page<TProcessesBlastdesignHoleVo> tSampleListPage = baseMapper.getPage(page, queryWrapper); Page<TProcessesBlastdesignHoleVo> data = baseMapper.getPage(page, queryWrapper);
return R.ok(tSampleListPage); //查询,根据筛选条件的总条数的孔深合计,不分页 孔深合计
Double depthSum = baseMapper.getSumByCondition(new StringBuffer()
.append(ProjectEnum.TableAlias.A.getLabel())
.append(ProjectEnum.TProcessesBlastdesignVolume.DEPTH.getLabel()).toString(), queryWrapper);
return R.ok(new TProcessesBlastdesignHoleResultVo<>(data,depthSum));
} }
@Override @Override
public R updateByUid(TProcessesBlastdesignHoleQuery query) { public R updateByUid(TProcessesBlastdesignHoleQuery query) {
log.info(JSON.toJSONString(query)); log.info(JSON.toJSONString(query));
...@@ -151,11 +158,13 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -151,11 +158,13 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
if (volume.getData() == null) { if (volume.getData() == null) {
return R.failed("设计爆区爆破量表数据不存在,StopeName,StepName,BlastAreaName"); return R.failed("设计爆区爆破量表数据不存在,StopeName,StepName,BlastAreaName");
} }
//条件封装 //条件封装
TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole(); TProcessesBlastdesignHole tProcessesBlastdesignHole = new TProcessesBlastdesignHole();
BeanUtils.copyProperties(query, tProcessesBlastdesignHole); BeanUtils.copyProperties(query, tProcessesBlastdesignHole);
//单孔爆破量(m3)=孔距*排距*台阶高度
tProcessesBlastdesignHole.setHoleBlastVolume(tProcessesBlastdesignHole.getHoleSpace()
* tProcessesBlastdesignHole.getRowSpace()
* tProcessesBlastdesignHole.getStepHeight());
//增加 //增加
log.info(JSON.toJSONString(tProcessesBlastdesignHole)); log.info(JSON.toJSONString(tProcessesBlastdesignHole));
int insert = baseMapper.insert(tProcessesBlastdesignHole); int insert = baseMapper.insert(tProcessesBlastdesignHole);
......
...@@ -168,5 +168,30 @@ public class DateUtil { ...@@ -168,5 +168,30 @@ public class DateUtil {
return endT; return endT;
} }
/**
* 字符串转化为时间
*/
public static LocalDateTime strToTime(String timeStr){
if (StringUtils.isBlank(timeStr)) throw new RuntimeException("LocalDateTime strToTime: String timeStr is null");
try {
LocalDateTime ldt = LocalDateTime.parse(timeStr,DateTimeFormatter.ofPattern(FORMAT_TO_SECOND));
return ldt;
}catch (Exception e){
throw new RuntimeException("transform str to time is failed");
}
}
/**
* 时间转化为字符串
*/
public static String timeToStr(LocalDateTime time,String format){
if (time == null) throw new RuntimeException("LocalDateTime timeToStr: LocalDateTime time is null");
try {
String date = DateTimeFormatter.ofPattern(format).format(time);
return date;
}catch (Exception e){
throw new RuntimeException("transform time to str is failed");
}
}
} }
...@@ -47,4 +47,16 @@ ...@@ -47,4 +47,16 @@
</where> </where>
</select> </select>
<!-- 获取所有getByQuery列表 -->
<select id="getSumByCondition" resultType="Double">
SELECT
sum(${condition})
FROM T_Processes_BlastDesign_Hole a
<include refid="TProcessesBlastdesignHoleJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>
<?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="cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper">
</mapper>
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