Skip to content

D
data-acquisition
Commit 08d7b6c3 authored by renchao's avatar renchao
Browse files
Options

生产工序业务修改

parent 2037ac40
Show whitespace changes
Inline Side-by-side
Showing with 962 additions and 261 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java
View file @ 08d7b6c3
......@@ -10,11 +10,9 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank;
/**
* <p>
......@@ -25,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2021-04-30
*/
@RestController
@Api(tags = "生成工序-辅助工序")
@Api(tags = "生成工序-破碎工序")
@RequestMapping("/business/t-processes-crusher")
public class TProcessesCrusherController {
......@@ -72,5 +70,19 @@ public class TProcessesCrusherController {
public R insertTProcessesCrusher(@RequestBody TProcessesCrusherQuery tProcessesCrusherQuery) {
return itProcessesCrusherService.insertTProcessesCrusher(tProcessesCrusherQuery);
}
/**
* 根据uid获取破碎工序
*
* @return
*/
@ApiOperation(value = "根据uid获取破碎工序")
@GetMapping(value = "/getByUid/{uid}")
public R getByUid(@PathVariable @NotBlank String uid) {
TProcessesCrusherQuery tProcessesCrusherQuery = new TProcessesCrusherQuery();
tProcessesCrusherQuery.setUid(uid);
return itProcessesCrusherService.getByUid(tProcessesCrusherQuery);
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDrilling.java
View file @ 08d7b6c3
......@@ -3,9 +3,13 @@ package cn.wise.sc.acquisition.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -24,7 +28,7 @@ import lombok.experimental.Accessors;
@TableName("T_Processes_Drilling")
public class TProcessesDrilling implements Serializable {
private static final long serialVersionUID=1L;
private static final long serialVersionUID = 1L;
/**
* ID号
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWeight.java
View file @ 08d7b6c3
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -31,16 +33,11 @@ public class TWeight implements Serializable {
private String Uid;
/**
* 日期
* 日期 日期=日期+时间
*/
@TableField("Rq")
private String Rq;
private LocalDateTime Rq;
/**
* 时间
*/
@TableField("Sj")
private String Sj;
/**
* 矿车编号
......@@ -73,4 +70,69 @@ public class TWeight implements Serializable {
private String Tag;
/**
* 毛重时间
*/
@TableField("Mzsj")
private LocalDateTime Mzsj;
/**
* 皮重时间
*/
@TableField("Pzsj")
private LocalDateTime Pzsj;
/**
* 操作员
*/
@TableField("Czy")
private String Czy;
/**
* 台号
*/
@TableField("Th")
private String Th;
/**
* 出入类型
*/
@TableField("Crlx")
private String Crlx;
/**
* 备用2
*/
@TableField("BeiY")
private String BeiY;
/**
* 收货
*/
@TableField("Sh")
private String Sh;
/**
* 发货
*/
@TableField("Fh")
private String Fh;
/**
* 货名
*/
@TableField("Hm")
private String Hm;
/**
* 车号
*/
@TableField("Ch")
private String Ch;
/**
* 序号
*/
@TableField("Xh")
private String Xh;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
View file @ 08d7b6c3
......@@ -205,12 +205,12 @@ public class ProjectEnum {
* 根据value,获取label
*/
public static String getLabel(int value) {
for (TSampleListType c : TSampleListType.values()) {
for (TableAlias c : TableAlias.values()) {
if (c.value == value) {
return c.label;
}
}
return TSampleListType.YH.label;
return TableAlias.A.label;
}
/**
......@@ -239,6 +239,67 @@ public class ProjectEnum {
}
/**
* 数据库别名字段 例如select * from TProcessesBlastdesignVolume b,会在queryWrapper中用到
*/
public enum TWeight {
JZ(1, "Jz","净重"),
RQ(2, "Rq","日期");
// 成员变量
private int value;
private String label;
private String explain;
// 构造方法
TWeight(int value, String label, String explain) {
this.value = value;
this.label = label;
this.explain = explain;
}
/**
* 根据value,获取label
*/
public static String getLabel(int value) {
for (TWeight c : TWeight.values()) {
if (c.value == value) {
return c.label;
}
}
return TWeight.JZ.label;
}
/**
* 根据label,获取value
*/
public static int getValue(String label) {
for (TWeight c : TWeight.values()) {
if (StringUtils.equalsIgnoreCase(label, c.label)) {
return c.value;
}
}
return TWeight.JZ.value;
}
public int getValue() {
return value;
}
public String getLabel() {
return label;
}
public String getexplain() {
return explain;
}
}
/**
* 炮孔设计模块业务枚举
*/
......@@ -396,8 +457,8 @@ public class ProjectEnum {
*/
public enum TProcessesBlastdesignHole {
UID(1, "StopeName","采区名称"),
UID(0, "Uid","uid"),
STOPE_NAME(1, "StopeName","采区名称"),
STEP_NAME(2, "StepName","平台名称"),
Blast_Area_Name(3, "BlastAreaName","爆区名称"),
BLAST_HOLE_ID(4, "BlastHoleID","炮孔编号"),
......@@ -488,9 +549,18 @@ public class ProjectEnum {
*/
public enum TProcessesBlast {
UID(1, "Uid","爆破工序uid"),
BLAST_DATE(2, "BlastDate","别名a");
UID(1, "Uid","uid"),
DESIGN_DEPTH(2, "DesignDepth","设计孔深"),
HOLE_BLAST_VOLUME(3, "HoleBlastVolume","单孔爆破量"),
DEPTH(4, "Depth","实测孔深"),
HOLE_ID(5, "HoleID","炮孔编号"),
BLAST_DATE(6, "BlastDate","别名a");
// 成员变量
......@@ -550,7 +620,7 @@ public class ProjectEnum {
*/
public enum TProcessesDrilling {
UID(1, "Uid","uid"),
UID(1, "Uid","Uid"),
DRILLING_DATE(2, "DrillingDate","穿孔日期"),
DEPTH(3, "Depth","孔深"),
ROW_SPACE(4, "RowSpace","排距（m）"),
......@@ -559,7 +629,8 @@ public class ProjectEnum {
DESIGN_ROW_SPACE(7, "DesignRowSpace","设计排距（m）"),
DESIGN_HOLE_SPACE(8, "DesignHoleSpace","设计孔距（m）"),
STEP_HEIGHT(9, "StepHeight","台阶高度"),
HOLE_BLAST_VOLUME(10, "HoleBlastVolume","单孔爆破量");
HOLE_BLAST_VOLUME(10, "HoleBlastVolume","单孔爆破量"),
HOLE_ID(10, "HoleID","炮孔编号");
// 成员变量
private int value;
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.java
View file @ 08d7b6c3
......@@ -19,4 +19,6 @@ public interface TProcessesBlastMapper extends BaseMapper<TProcessesBlast> {
Page<TProcessesBlastVo> getPage(Page<TProcessesBlast> page, @Param("ew") QueryWrapper<TProcessesBlast> queryWrapper);
TProcessesBlastVo getByQuery(@Param("ew") QueryWrapper<TProcessesBlast> queryWrapper);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java
View file @ 08d7b6c3
......@@ -20,7 +20,7 @@ public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBl
Page<TProcessesBlastdesignHoleVo> getPage(Page<TProcessesBlastdesignHole> page, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
TProcessesBlastdesignHoleVo getByUId(@Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
TProcessesBlastdesignHoleVo getByQuery(@Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesBlastdesignHole> queryWrapper);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.java
View file @ 08d7b6c3
......@@ -19,4 +19,6 @@ public interface TProcessesCrusherMapper extends BaseMapper<TProcessesCrusher> {
Page<TProcessesCrusherVo> getPage(Page<TProcessesCrusher> page, @Param("ew") QueryWrapper<TProcessesCrusher> queryWrapper);
Page<TProcessesCrusherVo> getByQuery(@Param("ew") QueryWrapper<TProcessesCrusher> queryWrapper);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java
View file @ 08d7b6c3
......@@ -20,7 +20,7 @@ public interface TProcessesDrillingMapper extends BaseMapper<TProcessesDrilling>
Page<TProcessesDrillingVo> getPage(Page<TProcessesDrilling> page, @Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
TProcessesDrillingVo getByUid(@Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
TProcessesDrillingVo getByQuery(@Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TProcessesDrilling> queryWrapper);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWeightMapper.java
View file @ 08d7b6c3
package cn.wise.sc.acquisition.business.mapper;
import cn.wise.sc.acquisition.business.entity.TWeight;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* <p>
......@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TWeightMapper extends BaseMapper<TWeight> {
Double getSumByCondition(@Param("condition") String condition, @Param("ew") QueryWrapper<TWeight> queryWrapper);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastMapper.xml
View file @ 08d7b6c3
......@@ -24,11 +24,11 @@
<sql id="TProcessesDiggingHoleColumns">
b.HoleBlastVolume,
b.depth ,<!-- 设计孔深，将爆破工序里的depth去掉，用设计炮孔里的替代 -->
b.depth AS DesignDepth,<!-- 设计孔深，将爆破工序里的depth去掉，用设计炮孔里的替代 -->
</sql>
<sql id="TProcessesDrillingColumns">
c.Depth AS DesignDepth,
c.Depth,
</sql>
......@@ -50,4 +50,17 @@
</where>
</select>
<!-- 获取所有getByUid列表 -->
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
SELECT
<include refid="TProcessesDiggingHoleColumns"/>
<include refid="TProcessesDrillingColumns"/>
<include refid="TProcessesBlastColumns"/>
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
View file @ 08d7b6c3
......@@ -48,6 +48,18 @@
</select>
<!-- 获取所有getPage列表 -->
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
SELECT
<include refid="TProcessesBlastdesignVolumeColumns"/>
<include refid="TProcessesBlastdesignHoleColumns"/>
FROM T_Processes_BlastDesign_Hole a
<include refid="TProcessesBlastdesignHoleJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
<!-- 获取所有getByQuery列表 -->
<select id="getSumByCondition" resultType="Double">
SELECT
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml
View file @ 08d7b6c3
......@@ -15,7 +15,7 @@
a.EquipmentID,
a.WorkType,
a.WorkTime,
a.Wcdw,
-- a.Wcdw, /*吨位 查吨位表中的吨位*/
a.Price,
a.TotalMoney,
a.Bz,
......@@ -23,12 +23,20 @@
</sql>
<sql id="TWeightColumns">
b.Jz,
b.Wcdw, /*吨位 替换破碎工序中的吨位*/
</sql>
<sql id="TProcessesCrusherJoins">
left join T_Weight b on a.EquipmentID=b.TruckID
LEFT JOIN (
SELECT
Rq,
SUM (Jz) AS Wcdw /*吨位 替换破碎工序中的吨位*/
FROM
T_Weight
GROUP BY
Rq
) b ON a.CrushDate = b.Rq
</sql>
<!-- 获取所有getPage列表 -->
......@@ -43,4 +51,17 @@
</where>
</select>
<!-- 获取所有getPage列表 -->
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
SELECT
<include refid="TWeightColumns"/>
<include refid="TProcessesCrusherColumns"/>
FROM T_Processes_Crusher a
<include refid="TProcessesCrusherJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml
View file @ 08d7b6c3
......@@ -30,8 +30,6 @@
a.x,
a.y,
a.z,
-- a.HoleBlastVolume, /* 用炮孔设计的爆破量 */
a.BlastDate,
a.Operator,
a.Accepter,
......@@ -40,35 +38,40 @@
</sql>
<sql id="TProcessesDiggingHoleColumns">
b.Depth AS DesignDepth,/*孔深（m）*/
b.RowSpace AS DesignRowSpace,/*排距（m）*/
b.HoleSpace AS DesignHoleSpace,/*孔距（m）*/
b.Azimuth AS DesignAzimuth,/*方位角*/
b.Inclination AS DesignInclination,/*倾角*/
b.Aperture AS DesignAperture,/*孔径(m)*/
-- b.x;/*开孔坐标X*/
-- b.y;/*开孔坐标Y*/
-- b.z;/*开孔坐标Z*/
b.HoleBlastVolume,/* 单孔爆破量(m3)=孔距*排距*台阶高度*/
b.Depth AS DesignDepth,
b.RowSpace AS DesignRowSpace,
b.HoleSpace AS DesignHoleSpace,
b.Azimuth AS DesignAzimuth,
b.Inclination AS DesignInclination,
b.Aperture AS DesignAperture,
b.HoleBlastVolume,
</sql>
<sql id="TProcessesBlastColumns">
c.BlastDate
c.BlastDate,
</sql>
<sql id="TProcessesBlastdesignVolumeColumns">
d.BlastVolume,
d.DesignDate,
</sql>
<sql id="TProcessesBlastdesignHoleJoins">
<sql id="TProcessesDrillingJoins">
left join T_Processes_BlastDesign_Hole b on a.HoleID = b.BlastHoleID
left join T_Processes_Blast c on a.HoleID = c.HoleID
left join T_Processes_BlastDesign_Volume d on a.StopeName=d.StopeName and a.StepName=d.StepName and a.BlastAreaName=d.BlastAreaName
</sql>
<!-- 获取所有getPage列表 -->
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
SELECT
<include refid="TProcessesDiggingHoleColumns"/>
<include refid="TProcessesDrillingColumns"/>
<include refid="TProcessesBlastColumns"/>
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
<include refid="TProcessesBlastdesignVolumeColumns"/>
<include refid="TProcessesDrillingColumns"/>
FROM T_Processes_Drilling a
<include refid="TProcessesDrillingJoins"/>
<where>
${ew.sqlSegment}
</where>
......@@ -76,13 +79,14 @@
<!-- 获取所有getPage列表 -->
<select id="getByUid" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
SELECT
<include refid="TProcessesDiggingHoleColumns"/>
<include refid="TProcessesDrillingColumns"/>
<include refid="TProcessesBlastColumns"/>
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
<include refid="TProcessesBlastdesignVolumeColumns"/>
<include refid="TProcessesDrillingColumns"/>
FROM T_Processes_Drilling a
<include refid="TProcessesDrillingJoins"/>
<where>
${ew.sqlSegment}
</where>
......@@ -92,8 +96,7 @@
<select id="getSumByCondition" resultType="Double">
SELECT
sum(${condition})
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
FROM T_Processes_Drilling a
<where>
${ew.sqlSegment}
</where>
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWeightMapper.xml
View file @ 08d7b6c3
......@@ -2,4 +2,15 @@
<!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.TWeightMapper">
<!-- 根据条件求和某字段 -->
<select id="getSumByCondition" resultType="Double">
SELECT
sum(${condition})
FROM T_Weight a
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesDrillingQuery.java
View file @ 08d7b6c3
......@@ -200,4 +200,33 @@ public class TProcessesDrillingQuery {
private String Tag;
//以下是增加字段 需要表连接的字段 炮孔设计
@ApiModelProperty("孔深（m）")
private Double DesignDepth;
@ApiModelProperty("排距（m）")
private Double DesignRowSpace;
@ApiModelProperty("孔距（m）")
private Double DesignHoleSpace;
@ApiModelProperty("设计方位角")
private Double DesignAzimuth;
@ApiModelProperty("设计倾角")
private Double DesignInclination;
@ApiModelProperty("设计孔径")
private Double DesignAperture;
@ApiModelProperty("台阶高度")
private Double StepHeight;
//以下是增加字段 爆破设计量表
@ApiModelProperty("爆破设计量")
private Double BlastVolume;
@ApiModelProperty("设计时间")
private LocalDateTime DesignDate;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TWeightQuery.java
View file @ 08d7b6c3
......@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
......@@ -23,18 +25,13 @@ public class TWeightQuery {
*/
@ApiModelProperty("Uid")
private String Uid;
/**
* 日期
* 日期 日期=日期+时间
*/
@ApiModelProperty("Rq")
private String Rq;
private LocalDateTime Rq;
/**
* 时间
*/
@ApiModelProperty("Sj")
private String Sj;
/**
* 矿车编号
......@@ -67,4 +64,69 @@ public class TWeightQuery {
private String Tag;
/**
* 毛重时间
*/
@ApiModelProperty("Mzsj")
private LocalDateTime Mzsj;
/**
* 皮重时间
*/
@ApiModelProperty("Pzsj")
private LocalDateTime Pzsj;
/**
* 操作员
*/
@ApiModelProperty("Czy")
private String Czy;
/**
* 台号
*/
@ApiModelProperty("Th")
private String Th;
/**
* 出入类型
*/
@ApiModelProperty("Crlx")
private String Crlx;
/**
* 备用2
*/
@ApiModelProperty("BeiY")
private String BeiY;
/**
* 收货
*/
@ApiModelProperty("Sh")
private String Sh;
/**
* 发货
*/
@ApiModelProperty("Fh")
private String Fh;
/**
* 货名
*/
@ApiModelProperty("Hm")
private String Hm;
/**
* 车号
*/
@ApiModelProperty("Ch")
private String Ch;
/**
* 序号
*/
@ApiModelProperty("Xh")
private String Xh;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesBlastVo.java
View file @ 08d7b6c3
......@@ -24,90 +24,90 @@ public class TProcessesBlastVo {
*/
@ApiModelProperty("Uid")
private String Uid;
//
// /**
// * 采区名称
// */
// @ApiModelProperty("StopeName")
// private String StopeName;
//
// /**
// * 平台名称
// */
// @ApiModelProperty("StepName")
// private String StepName;
//
// /**
// * 爆区名称
// */
// @ApiModelProperty("BlastAreaName")
// private String BlastAreaName;
//
// /**
// * 炮孔编号
// */
// @ApiModelProperty("HoleID")
// private String HoleID;
//
// /**
// * 爆破日期
// */
// @ApiModelProperty("BlastDate")
// private LocalDateTime BlastDate;
//
// /**
// * 爆破人员
// */
// @ApiModelProperty("BlastPeople")
// private String BlastPeople;
//
// /**
// * 验孔日期
// */
// @ApiModelProperty("CheckHoleDate")
// private LocalDateTime CheckHoleDate;
//
// /**
// * 验孔人员
// */
// @ApiModelProperty("CheckHolePeople")
// private String CheckHolePeople;
//
// /**
// * 项目经理
// */
// @ApiModelProperty("Manager")
// private String Manager;
//
// /**
// * 主管项目领导
// */
// @ApiModelProperty("Supervisor")
// private String Supervisor;
//
// /**
// * 生产技术部
// */
// @ApiModelProperty("TechDepart")
// private String TechDepart;
//
// /**
// * 制表人
// */
// @ApiModelProperty("Tabulator")
// private String Tabulator;
//
//
//
// @ApiModelProperty("Bz")
// private String Bz;
//
// /**
// * 日期标记,如:2020年11月
// */
// @ApiModelProperty("Tag")
// private String Tag;
//
/**
* 采区名称
*/
@ApiModelProperty("StopeName")
private String StopeName;
/**
* 平台名称
*/
@ApiModelProperty("StepName")
private String StepName;
/**
* 爆区名称
*/
@ApiModelProperty("BlastAreaName")
private String BlastAreaName;
/**
* 炮孔编号
*/
@ApiModelProperty("HoleID")
private String HoleID;
/**
* 爆破日期
*/
@ApiModelProperty("BlastDate")
private LocalDateTime BlastDate;
/**
* 爆破人员
*/
@ApiModelProperty("BlastPeople")
private String BlastPeople;
/**
* 验孔日期
*/
@ApiModelProperty("CheckHoleDate")
private LocalDateTime CheckHoleDate;
/**
* 验孔人员
*/
@ApiModelProperty("CheckHolePeople")
private String CheckHolePeople;
/**
* 项目经理
*/
@ApiModelProperty("Manager")
private String Manager;
/**
* 主管项目领导
*/
@ApiModelProperty("Supervisor")
private String Supervisor;
/**
* 生产技术部
*/
@ApiModelProperty("TechDepart")
private String TechDepart;
/**
* 制表人
*/
@ApiModelProperty("Tabulator")
private String Tabulator;
@ApiModelProperty("Bz")
private String Bz;
/**
* 日期标记,如:2020年11月
*/
@ApiModelProperty("Tag")
private String Tag;
/**
* 实测孔深（m）
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TProcessesDrillingVo.java
View file @ 08d7b6c3
......@@ -200,7 +200,7 @@ public class TProcessesDrillingVo {
private String Tag;
//以下是增加字段 需要表连接的字段
//以下是增加字段 需要表连接的字段 炮孔设计
@ApiModelProperty("孔深（m）")
private Double DesignDepth;
......@@ -223,5 +223,11 @@ public class TProcessesDrillingVo {
@ApiModelProperty("台阶高度")
private Double StepHeight;
//以下是增加字段 爆破设计量表
@ApiModelProperty("爆破设计量")
private Double BlastVolume;
@ApiModelProperty("设计时间")
private LocalDateTime DesignDate;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/vo/TWeightVo.java
View file @ 08d7b6c3
......@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
......@@ -23,18 +25,13 @@ public class TWeightVo {
*/
@ApiModelProperty("Uid")
private String Uid;
/**
* 日期
* 日期 日期=日期+时间
*/
@ApiModelProperty("Rq")
private String Rq;
private LocalDateTime Rq;
/**
* 时间
*/
@ApiModelProperty("Sj")
private String Sj;
/**
* 矿车编号
......@@ -67,4 +64,69 @@ public class TWeightVo {
private String Tag;
/**
* 毛重时间
*/
@ApiModelProperty("Mzsj")
private LocalDateTime Mzsj;
/**
* 皮重时间
*/
@ApiModelProperty("Pzsj")
private LocalDateTime Pzsj;
/**
* 操作员
*/
@ApiModelProperty("Czy")
private String Czy;
/**
* 台号
*/
@ApiModelProperty("Th")
private String Th;
/**
* 出入类型
*/
@ApiModelProperty("Crlx")
private String Crlx;
/**
* 备用2
*/
@ApiModelProperty("BeiY")
private String BeiY;
/**
* 收货
*/
@ApiModelProperty("Sh")
private String Sh;
/**
* 发货
*/
@ApiModelProperty("Fh")
private String Fh;
/**
* 货名
*/
@ApiModelProperty("Hm")
private String Hm;
/**
* 车号
*/
@ApiModelProperty("Ch")
private String Ch;
/**
* 序号
*/
@ApiModelProperty("Xh")
private String Xh;
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java
View file @ 08d7b6c3
......@@ -23,4 +23,6 @@ public interface ITProcessesBlastService extends IService<TProcessesBlast> {
R insertTProcessesBlast(TProcessesBlastQuery query);
R getByUid(TProcessesBlastQuery query);
R getByHoleId(TProcessesBlastQuery query);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java
View file @ 08d7b6c3
......@@ -20,6 +20,8 @@ public interface ITProcessesBlastdesignHoleService extends IService<TProcessesBl
R updateByUid(TProcessesBlastdesignHoleQuery query);
R updateByBlastHoleID(TProcessesBlastdesignHoleQuery query);
R deleteByUid(TProcessesBlastdesignHoleQuery query);
R insertTProcessesBlastdesignHole(TProcessesBlastdesignHoleQuery query);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java
View file @ 08d7b6c3
......@@ -18,6 +18,8 @@ public interface ITProcessesCrusherService extends IService<TProcessesCrusher> {
R getPage(TProcessesCrusherQuery tProcessesCrusherQuery, Query query);
R getByUid(TProcessesCrusherQuery tProcessesCrusherQuery);
R updateByUid(TProcessesCrusherQuery query);
R insertTProcessesCrusher(TProcessesCrusherQuery query);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java
View file @ 08d7b6c3
......@@ -22,6 +22,10 @@ public interface ITProcessesDrillingService extends IService<TProcessesDrilling>
R updateByUid(TProcessesDrillingQuery query);
R updateByHoleId(TProcessesDrillingQuery query);
R getByUid(TProcessesDrillingQuery query);
R getByHoleId(TProcessesDrillingQuery query);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWeightService.java
View file @ 08d7b6c3
......@@ -14,5 +14,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @since 2021-04-26
*/
public interface ITWeightService extends IService<TWeight> {
R getByQuery(TWeightQuery query);
R getSumJz(TWeightQuery query);
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
View file @ 08d7b6c3
......@@ -6,9 +6,13 @@ import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper;
import cn.wise.sc.acquisition.business.model.query.TMineStopeQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesBlastdesignHoleQuery;
import cn.wise.sc.acquisition.business.model.query.TProcessesDrillingQuery;
import cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo;
import cn.wise.sc.acquisition.business.service.ITMineStopeService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
import cn.wise.sc.acquisition.business.service.ITProcessesDrillingService;
import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
import cn.wise.sc.acquisition.business.util.DateUtil;
import cn.wise.sc.acquisition.business.wrapper.page.Query;
......@@ -38,6 +42,12 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
@Autowired
private ITMineStopeService itMineStopeService;
@Autowired
private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService;
@Autowired
private ITProcessesDrillingService itProcessesDrillingService;
@Override
public R getPage(TProcessesBlastQuery tProcessesBlastQuery, Query query) {
log.info(JSON.toJSONString(tProcessesBlastQuery));
......@@ -46,6 +56,12 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
Page<TProcessesBlast> page = new Page<>(query.getPageNum(), query.getPageSize());
//条件封装
QueryWrapper<TProcessesBlast> queryWrapper = new QueryWrapper<>();
queryWrapper.select(
ProjectEnum.TProcessesBlast.DEPTH.getLabel(),
ProjectEnum.TProcessesBlast.DESIGN_DEPTH.getLabel(),
ProjectEnum.TProcessesBlast.HOLE_ID.getLabel(),
ProjectEnum.TProcessesBlast.HOLE_BLAST_VOLUME.getLabel()
);
//如果设计时间不为空 因为涉及到表连接，需要创建字段别名
if (tProcessesBlastQuery.getBlastDate() != null) {
StringBuilder stringBuilder = new StringBuilder();
......@@ -65,12 +81,21 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
Rcode.NOT_PARAM.assertNotNull(query.getUid());
//判断数据是否存在
TProcessesBlast temp = baseMapper.selectById(query.getUid());
if (temp == null) {
return R.failed("数据不存在，uid：" + query.getUid());
return R.failed("数据不存在：uid：" + query.getUid());
}
//判断炮孔编号是否已经存在
if (StringUtils.isNotBlank(query.getHoleID())) {
R r = getByHoleId(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: HoleID:" + query.getHoleID());
}
}
//条件封装
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
//判断是否需要修改关联的 矿山爆区表
if (StringUtils.isNotBlank(query.getStepName())
|| StringUtils.isNotBlank(query.getBlastAreaName())
......@@ -78,7 +103,6 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
//判断矿山爆区表是否存在数据 不存在不能修改
//query里不一定StopeName,StepName,BlastAreaName都有，需要从temp中拿query没有的，
// 所以将query有的更新到temp中，再把temp中的复制到tMineStopeQuery
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
TMineStopeQuery tMineStopeQuery = new TMineStopeQuery();
BeanUtils.copyProperties(temp, tMineStopeQuery);
R volume = itMineStopeService.getByQuery(tMineStopeQuery);
......@@ -86,18 +110,36 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
return R.failed("矿山爆区表数据不存在，StopeName,StepName,BlastAreaName");
}
}
//条件封装
TProcessesBlast tProcessesBlast = new TProcessesBlast();
BeanUtils.copyProperties(query, tProcessesBlast);
//判断是否修改设计孔深
if (query.getDesignDepth() != null) {
TProcessesBlastdesignHoleQuery holeQuery = new TProcessesBlastdesignHoleQuery();
holeQuery.setBlastHoleID(temp.getHoleID());
holeQuery.setDepth(query.getDepth());
R r = itProcessesBlastdesignHoleService.updateByBlastHoleID(holeQuery);
if (r.getCode() != 0) {
log.error("修改炮孔设计失败：{}", JSON.toJSONString(holeQuery));
return R.failed(r.getMsg());
}
}
//判断是否修改实测孔深
if (query.getDepth() != null) {
TProcessesDrillingQuery drillingQuery = new TProcessesDrillingQuery();
drillingQuery.setHoleID(temp.getHoleID());
drillingQuery.setDepth(query.getDepth());
R r = itProcessesDrillingService.updateByHoleId(drillingQuery);
if (r.getCode() != 0) {
log.error("修改穿孔工序失败：{}", JSON.toJSONString(drillingQuery));
return R.failed(r.getMsg());
}
}
QueryWrapper<TProcessesBlast> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlast.UID.getLabel(), query.getUid());
queryWrapper.eq(StringUtils.isNotBlank(query.getUid()), ProjectEnum.TProcessesBlast.UID.getLabel(), query.getUid());
//修改
int update = baseMapper.update(tProcessesBlast, queryWrapper);
int update = baseMapper.update(temp, queryWrapper);
if (update > 0) {
return R.ok("修改成功");
} else {
log.info(JSON.toJSONString(tProcessesBlast));
log.error("修改失败:{}", JSON.toJSONString(temp));
return R.failed("修改失败");
}
}
......@@ -115,6 +157,13 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
if (query.getUid() != null) {
return R.failed("uid自动生成 不能手动设置");
}
//判断炮孔编号是否已经存在
if (StringUtils.isNotBlank(query.getHoleID())) {
R r = getByHoleId(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: HoleID:" + query.getHoleID());
}
}
//条件封装
TProcessesBlast tProcessesDrilling = new TProcessesBlast();
BeanUtils.copyProperties(query, tProcessesDrilling);
......@@ -134,7 +183,25 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
QueryWrapper<TProcessesBlast> queryWrapper = new QueryWrapper<>();
StringBuilder uid = new StringBuilder();
uid.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlast.UID.getLabel());
queryWrapper.eq(uid.toString(), query.getUid());
//查询并且返回
return R.ok(baseMapper.getByQuery(queryWrapper));
}
@Override
public R getByHoleId(TProcessesBlastQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getHoleID());
QueryWrapper<TProcessesBlast> queryWrapper = new QueryWrapper<>();
StringBuilder holeId = new StringBuilder();
holeId.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlast.HOLE_ID.getLabel());
queryWrapper.eq(holeId.toString(), query.getHoleID());
//查询并且返回
return R.ok(baseMapper.selectById(query.getUid()));
return R.ok(baseMapper.getByQuery(queryWrapper));
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
View file @ 08d7b6c3
......@@ -96,11 +96,18 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
//判断数据炮孔设计是否存在
Rcode.NOT_PARAM.assertNotNull(query.getUid());
//判断数据是否存在
TProcessesBlastdesignHole temp = baseMapper.selectById(query.getUid());
if (temp == null) {
return R.failed("数据不存在，uid：" + query.getUid());
return R.failed("数据不存在：uid：" + query.getUid());
}
//判断炮孔编号是否存在
if (StringUtils.isNotBlank(query.getBlastHoleID())) {
R r = getByBlastHoleID(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: BlastHoleID:" + query.getBlastHoleID());
}
}
//判断是否需要修改关联的 设计爆区爆破量
if (StringUtils.isNotBlank(query.getStepName())
......@@ -121,7 +128,6 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
//如果修改了孔距，排距，台阶高度 需要重新计算单孔爆破量， 单孔爆破量(m3)=孔距*排距*台阶高度
//所以直接copy上面根据uid查出来的数据 copy ->非空值<- 将query的值更新到查出来的对象上 进行计算并更新到数据库即可
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
//判断是否修改设计爆区爆破量 的设计日期，或者设计爆区爆破量(m3) TAT
if (query.getDesignDate() != null || query.getBlastVolume() != null) {
TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
......@@ -136,8 +142,13 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
return R.failed(r.getMsg());
}
}
//判断是否需要重新计算爆破量
if (query.getHoleSpace() != null
|| query.getRowSpace() != null
|| query.getStepHeight() != null) {
//计算单孔爆破量
calculateHoleBlastVolume(temp);
}
QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid());
//修改
......@@ -150,6 +161,26 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
}
}
@Override
public R updateByBlastHoleID(TProcessesBlastdesignHoleQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getBlastHoleID());
//判断数据炮孔设计是否存在
//判断数据是否存在
QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.BLAST_HOLE_ID.getLabel(), query.getBlastHoleID());
TProcessesBlastdesignHole temp = baseMapper.selectOne(queryWrapper);
if (temp == null) {
return R.failed("数据不存在：BLAST_HOLE_ID：" + query.getBlastHoleID());
}
query.setUid(temp.getUid());
//调用基础方法修改
return updateByUid(query);
}
@Override
public R deleteByUid(TProcessesBlastdesignHoleQuery query) {
......@@ -196,6 +227,13 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
if (query.getUid() != null) {
return R.failed("uid自动生成 不能手动设置");
}
//判断炮孔编号是否存在
if (StringUtils.isNotBlank(query.getBlastHoleID())) {
R r = getByBlastHoleID(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: BlastHoleID:" + query.getBlastHoleID());
}
}
//查看设计爆区爆破量是否存在数据
TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
BeanUtils.copyProperties(query, tProcessesBlastdesignVolumeQuery);
......@@ -235,7 +273,7 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
tProcessesBlastQuery.setTag(DateUtil.timeToStr(LocalDateTime.now(), DateUtil.FORMAT_TO_SECOND));
R r2 = itProcessesBlastService.insertTProcessesBlast(tProcessesBlastQuery);
if (r2.getCode() != 0) {
log.error("增加一条爆破工序:" + JSON.toJSONString(tProcessesDrillingQuery));
log.error("增加一条爆破工序失败:" + JSON.toJSONString(tProcessesDrillingQuery));
return R.failed(r1.getMsg());
}
return R.ok("增加成功");
......@@ -253,9 +291,11 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
//条件
QueryWrapper<TProcessesBlastdesignHole> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel(), query.getUid());
StringBuilder uid = new StringBuilder();
uid.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesBlastdesignHole.UID.getLabel());
queryWrapper.eq(uid.toString(), query.getUid());
//查询并且返回
return R.ok(baseMapper.getByUId(queryWrapper));
return R.ok(baseMapper.getByQuery(queryWrapper));
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java
View file @ 08d7b6c3
......@@ -46,13 +46,28 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
return R.ok(tSampleListPage);
}
@Override
public R getByUid(TProcessesCrusherQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getUid());
//查询并且返回
QueryWrapper<TProcessesCrusher> queryWrapper = new QueryWrapper<>();
StringBuilder uid = new StringBuilder();
uid.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesCrusher.UID.getLabel());
queryWrapper.eq(uid.toString(), query.getUid());
//查询并且返回
return R.ok(baseMapper.getByQuery(queryWrapper));
}
@Override
public R updateByUid(TProcessesCrusherQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
Rcode.NOT_PARAM.assertNotNull(query.getUid());
//判断数据是否存在
TProcessesCrusher temp = baseMapper.selectById(query.getUid());
if (temp == null) {
......@@ -63,7 +78,7 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
BeanUtils.copyProperties(query, tSampleList);
QueryWrapper<TProcessesCrusher> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesCrusher.UID.getLabel(), query.getUid());
queryWrapper.eq(StringUtils.isNotBlank(query.getUid()),ProjectEnum.TProcessesCrusher.UID.getLabel(), query.getUid());
//修改
int update = baseMapper.update(tSampleList, queryWrapper);
if (update > 0) {
......@@ -97,4 +112,7 @@ public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherM
return R.failed("增加失败");
}
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
View file @ 08d7b6c3
......@@ -7,11 +7,13 @@ import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TProcessesDrillingMapper;
import cn.wise.sc.acquisition.business.model.query.TMineStopeQuery;
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.TProcessesDrillingQuery;
import cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo;
import cn.wise.sc.acquisition.business.model.vo.TProcessesProductVo;
import cn.wise.sc.acquisition.business.service.ITMineStopeService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
import cn.wise.sc.acquisition.business.service.ITProcessesDrillingService;
import cn.wise.sc.acquisition.business.util.BeanUtilsNewCopy;
import cn.wise.sc.acquisition.business.util.DateUtil;
......@@ -48,6 +50,9 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
@Autowired
private ITProcessesBlastdesignHoleService itProcessesBlastdesignHoleService;
@Autowired
private ITProcessesBlastdesignVolumeService itProcessesBlastdesignVolumeService;
@Override
public R getPage(TProcessesDrillingQuery tProcessesDrillingQuery, Query query) {
log.info(JSON.toJSONString(tProcessesDrillingQuery));
......@@ -83,12 +88,15 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
Double depthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
//查询，今日合计孔深
StringBuffer drillingDate = new StringBuffer()
.append(ProjectEnum.TableAlias.A.getLabel())
.append(ProjectEnum.TProcessesDrilling.DRILLING_DATE.getLabel());
//初始化QueryWrapper
LocalDateTime now = LocalDateTime.now();
queryWrapper = new QueryWrapper<>();
queryWrapper
.ge(ProjectEnum.TProcessesDrilling.DRILLING_DATE.getLabel(), DateUtil.getBeginTimeStr(now))
.le(ProjectEnum.TProcessesDrilling.DRILLING_DATE.getLabel(), DateUtil.getEndTimeStr(now));
.ge(drillingDate.toString(), DateUtil.getBeginTimeStr(now))
.le(drillingDate.toString(), DateUtil.getEndTimeStr(now));
Double todayDepthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
......@@ -97,8 +105,8 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
//初始化QueryWrapper
queryWrapper = new QueryWrapper<>();
queryWrapper
.ge(ProjectEnum.TProcessesDrilling.DRILLING_DATE.getLabel(), DateUtil.getBeginTimeStr(LocalDateTime.now().minusMonths(1).withDayOfMonth(26)))
.le(ProjectEnum.TProcessesDrilling.DRILLING_DATE.getLabel(), DateUtil.getEndTimeStr(LocalDateTime.now()));
.ge(drillingDate.toString(), DateUtil.getBeginTimeStr(LocalDateTime.now().minusMonths(1).withDayOfMonth(26)))
.le(drillingDate.toString(), DateUtil.getEndTimeStr(LocalDateTime.now()));
Double monthDepthSum = baseMapper.getSumByCondition(depth.toString(), queryWrapper);
return R.ok(new TProcessesProductVo<>(data, depthSum, todayDepthSum, monthDepthSum));
......@@ -117,6 +125,13 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
if (query.getUid() != null) {
return R.failed("uid自动生成 不能手动设置");
}
//判断炮孔编号是否已经存在
if (StringUtils.isNotBlank(query.getHoleID())) {
R r = getByHoleId(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: HoleID:" + query.getHoleID());
}
}
//条件封装
TProcessesDrilling tProcessesDrilling = new TProcessesDrilling();
BeanUtils.copyProperties(query, tProcessesDrilling);
......@@ -136,12 +151,21 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
Rcode.NOT_PARAM.assertNotNull(query.getUid());
//判断数据是否存在
TProcessesDrilling temp = baseMapper.selectById(query.getUid());
if (temp == null) {
return R.failed("数据不存在，uid：" + query.getUid());
return R.failed("数据不存在：uid: " + query.getUid());
}
//判断炮孔编号是否已经存在
if (StringUtils.isNotBlank(query.getHoleID())) {
R r = getByHoleId(query);
if (r.getData() != null) {
return R.failed("炮孔编号已存在: HoleID:" + query.getHoleID());
}
}
//条件封装
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
//判断是否需要修改关联的 矿山爆区表
if (StringUtils.isNotBlank(query.getStepName())
|| StringUtils.isNotBlank(query.getBlastAreaName())
......@@ -149,7 +173,6 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
//判断矿山爆区表是否存在数据 不存在不能修改
//query里不一定StopeName,StepName,BlastAreaName都有，需要从temp中拿query没有的，
// 所以将query有的更新到temp中，再把temp中的复制到tMineStopeQuery
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
TMineStopeQuery tMineStopeQuery = new TMineStopeQuery();
BeanUtils.copyProperties(temp, tMineStopeQuery);
R volume = itMineStopeService.getByQuery(tMineStopeQuery);
......@@ -157,21 +180,61 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
return R.failed("矿山爆区表数据不存在，StopeName,StepName,BlastAreaName");
}
}
//条件封装
BeanUtilsNewCopy.copyPropertiesIgnoreNull(query, temp);
//判断是否修改设计爆区爆破量 设计爆区爆破量(m3) TAT
if (query.getBlastVolume() != null) {
TProcessesBlastdesignVolumeQuery tProcessesBlastdesignVolumeQuery = new TProcessesBlastdesignHoleQuery();
tProcessesBlastdesignVolumeQuery.setStopeName(temp.getStopeName());
tProcessesBlastdesignVolumeQuery.setStepName(temp.getStepName());
tProcessesBlastdesignVolumeQuery.setBlastAreaName(temp.getBlastAreaName());
tProcessesBlastdesignVolumeQuery.setBlastVolume(query.getBlastVolume());
R r = itProcessesBlastdesignVolumeService.updateByQuery(tProcessesBlastdesignVolumeQuery);
if (r.getCode() != 0) {
log.info("修改设计爆区爆破量失败:{}", JSON.toJSONString(tProcessesBlastdesignVolumeQuery));
return R.failed(r.getMsg());
}
}
//判断是否修改炮孔设计
if (query.getDesignDepth() != null
|| query.getDesignRowSpace() != null
|| query.getDesignHoleSpace() != null
|| query.getDesignAzimuth() != null
|| query.getDesignInclination() != null
|| query.getDesignAperture() != null
|| query.getStepHeight() != null) {
TProcessesBlastdesignHoleQuery holeQuery = new TProcessesBlastdesignHoleQuery();
holeQuery.setBlastHoleID(temp.getHoleID());
holeQuery.setDepth(query.getDesignDepth());
holeQuery.setRowSpace(query.getDesignRowSpace());
holeQuery.setHoleSpace(query.getDesignHoleSpace());
holeQuery.setAzimuth(query.getAzimuth());
holeQuery.setInclination(query.getDesignInclination());
holeQuery.setAperture(query.getDesignAperture());
holeQuery.setStepHeight(query.getStepHeight());
R r = itProcessesBlastdesignHoleService.updateByBlastHoleID(holeQuery);
if (r.getCode() != 0) {
log.error("修改炮孔设计失败：{}", JSON.toJSONString(holeQuery));
return R.failed(r.getMsg());
}
}
//判断是否需要重新计算爆破量
if (query.getHoleSpace() != null || query.getRowSpace() != null) {
//计算单孔爆破量
//先获取台阶高度
//先获取炮孔设计数据台阶高度
TProcessesBlastdesignHoleQuery holeQuery = new TProcessesBlastdesignHoleQuery();
holeQuery.setBlastHoleID(temp.getHoleID());
R r = itProcessesBlastdesignHoleService.getByBlastHoleID(holeQuery);
//不为空计算台阶高度
//不为空计算单孔爆破量
if (r.getData() != null) {
TProcessesBlastdesignHole data = (TProcessesBlastdesignHole) r.getData();
Double volume = calculateHoleBlastVolume(temp.getHoleSpace(), temp.getRowSpace(), data.getStepHeight());
temp.setHoleBlastVolume(volume);
} else {
log.info("计算单孔爆破量时，获取炮孔设计为空，炮孔编号：{}", temp.getHoleID());
}
}
QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlast.UID.getLabel(), query.getUid());
queryWrapper.eq(StringUtils.isNotBlank(query.getUid()), ProjectEnum.TProcessesDrilling.UID.getLabel(), query.getUid());
//修改
int update = baseMapper.update(temp, queryWrapper);
if (update > 0) {
......@@ -183,6 +246,26 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
}
@Override
public R updateByHoleId(TProcessesDrillingQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotNull(query.getHoleID());
//判断数据是否存在
QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesBlast.HOLE_ID.getLabel(), query.getHoleID());
TProcessesDrilling temp = baseMapper.selectOne(queryWrapper);
if (temp == null) {
return R.failed("数据不存在：HOLE_ID: " + query.getHoleID());
}
//条件封装
query.setUid(temp.getUid());
//调用基础方法修改
return updateByUid(query);
}
@Override
public R getByUid(TProcessesDrillingQuery query) {
log.info(JSON.toJSONString(query));
......@@ -191,9 +274,27 @@ public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillin
Rcode.NOT_PARAM.assertNotEmpty(query.getUid());
//查询并且返回
QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ProjectEnum.TProcessesDrilling.UID.getLabel(), query.getUid());
StringBuilder uid = new StringBuilder();
uid.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesDrilling.UID.getLabel());
queryWrapper.eq(uid.toString(), query.getUid());
//查询并且返回
return R.ok(baseMapper.getByQuery(queryWrapper));
}
@Override
public R getByHoleId(TProcessesDrillingQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
Rcode.NOT_PARAM.assertNotEmpty(query.getHoleID());
//查询并且返回
QueryWrapper<TProcessesDrilling> queryWrapper = new QueryWrapper<>();
StringBuilder holeId = new StringBuilder();
holeId.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TProcessesDrilling.HOLE_ID.getLabel());
queryWrapper.eq(holeId.toString(), query.getHoleID());
//查询并且返回
return R.ok(baseMapper.getByUid(queryWrapper));
return R.ok(baseMapper.getByQuery(queryWrapper));
}
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWeightServiceImpl.java
View file @ 08d7b6c3
package cn.wise.sc.acquisition.business.service.impl;
import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TWeight;
import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
import cn.wise.sc.acquisition.business.mapper.TWeightMapper;
import cn.wise.sc.acquisition.business.model.query.TWeightQuery;
import cn.wise.sc.acquisition.business.service.ITWeightService;
import cn.wise.sc.acquisition.business.util.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
/**
......@@ -17,6 +24,7 @@ import org.springframework.stereotype.Service;
* @since 2021-04-26
*/
@Service
@Slf4j
public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> implements ITWeightService {
......@@ -25,5 +33,23 @@ public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> impl
return null;
}
@Override
public R getSumJz(TWeightQuery query) {
log.info(JSON.toJSONString(query));
//参数校验
Rcode.NOT_PARAM.assertNotNull(query);
QueryWrapper<TWeight> queryWrapper = new QueryWrapper<>();
if (query.getRq() != null) {
queryWrapper
.ge(ProjectEnum.TWeight.RQ.getLabel(), DateUtil.getBeginTimeStr(query.getRq()))
.le(ProjectEnum.TWeight.RQ.getLabel(), DateUtil.getEndTimeStr(query.getRq()));
}
//查询
Double depthSum = baseMapper.getSumByCondition(new StringBuffer()
.append(ProjectEnum.TableAlias.A.getLabel())
.append(ProjectEnum.TWeight.JZ.getLabel()).toString(), queryWrapper);
return R.ok(depthSum);
}
}
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.xml
View file @ 08d7b6c3
......@@ -24,11 +24,11 @@
<sql id="TProcessesDiggingHoleColumns">
b.HoleBlastVolume,
b.depth ,<!-- 设计孔深，将爆破工序里的depth去掉，用设计炮孔里的替代 -->
b.depth AS DesignDepth,<!-- 设计孔深，将爆破工序里的depth去掉，用设计炮孔里的替代 -->
</sql>
<sql id="TProcessesDrillingColumns">
c.Depth AS DesignDepth,
c.Depth,
</sql>
......@@ -50,4 +50,17 @@
</where>
</select>
<!-- 获取所有getByUid列表 -->
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastVo">
SELECT
<include refid="TProcessesDiggingHoleColumns"/>
<include refid="TProcessesDrillingColumns"/>
<include refid="TProcessesBlastColumns"/>
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml
View file @ 08d7b6c3
......@@ -48,6 +48,18 @@
</select>
<!-- 获取所有getPage列表 -->
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
SELECT
<include refid="TProcessesBlastdesignVolumeColumns"/>
<include refid="TProcessesBlastdesignHoleColumns"/>
FROM T_Processes_BlastDesign_Hole a
<include refid="TProcessesBlastdesignHoleJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
<!-- 获取所有getByQuery列表 -->
<select id="getSumByCondition" resultType="Double">
SELECT
......
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.xml
View file @ 08d7b6c3
......@@ -15,7 +15,7 @@
a.EquipmentID,
a.WorkType,
a.WorkTime,
a.Wcdw,
-- a.Wcdw, /*吨位 查吨位表中的吨位*/
a.Price,
a.TotalMoney,
a.Bz,
......@@ -23,12 +23,20 @@
</sql>
<sql id="TWeightColumns">
b.Jz,
b.Wcdw, /*吨位 替换破碎工序中的吨位*/
</sql>
<sql id="TProcessesCrusherJoins">
left join T_Weight b on a.EquipmentID=b.TruckID
LEFT JOIN (
SELECT
Rq,
SUM (Jz) AS Wcdw /*吨位 替换破碎工序中的吨位*/
FROM
T_Weight
GROUP BY
Rq
) b ON a.CrushDate = b.Rq
</sql>
<!-- 获取所有getPage列表 -->
......@@ -43,4 +51,17 @@
</where>
</select>
<!-- 获取所有getPage列表 -->
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesBlastdesignHoleVo">
SELECT
<include refid="TWeightColumns"/>
<include refid="TProcessesCrusherColumns"/>
FROM T_Processes_Crusher a
<include refid="TProcessesCrusherJoins"/>
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.xml
View file @ 08d7b6c3
......@@ -30,8 +30,6 @@
a.x,
a.y,
a.z,
-- a.HoleBlastVolume, /* 用炮孔设计的爆破量 */
a.BlastDate,
a.Operator,
a.Accepter,
......@@ -40,35 +38,40 @@
</sql>
<sql id="TProcessesDiggingHoleColumns">
b.Depth AS DesignDepth,/*孔深（m）*/
b.RowSpace AS DesignRowSpace,/*排距（m）*/
b.HoleSpace AS DesignHoleSpace,/*孔距（m）*/
b.Azimuth AS DesignAzimuth,/*方位角*/
b.Inclination AS DesignInclination,/*倾角*/
b.Aperture AS DesignAperture,/*孔径(m)*/
-- b.x;/*开孔坐标X*/
-- b.y;/*开孔坐标Y*/
-- b.z;/*开孔坐标Z*/
b.HoleBlastVolume,/* 单孔爆破量(m3)=孔距*排距*台阶高度*/
b.Depth AS DesignDepth,
b.RowSpace AS DesignRowSpace,
b.HoleSpace AS DesignHoleSpace,
b.Azimuth AS DesignAzimuth,
b.Inclination AS DesignInclination,
b.Aperture AS DesignAperture,
b.HoleBlastVolume,
</sql>
<sql id="TProcessesBlastColumns">
c.BlastDate
c.BlastDate,
</sql>
<sql id="TProcessesBlastdesignVolumeColumns">
d.BlastVolume,
d.DesignDate,
</sql>
<sql id="TProcessesBlastdesignHoleJoins">
<sql id="TProcessesDrillingJoins">
left join T_Processes_BlastDesign_Hole b on a.HoleID = b.BlastHoleID
left join T_Processes_Blast c on a.HoleID = c.HoleID
left join T_Processes_BlastDesign_Volume d on a.StopeName=d.StopeName and a.StepName=d.StepName and a.BlastAreaName=d.BlastAreaName
</sql>
<!-- 获取所有getPage列表 -->
<select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
SELECT
<include refid="TProcessesDiggingHoleColumns"/>
<include refid="TProcessesDrillingColumns"/>
<include refid="TProcessesBlastColumns"/>
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
<include refid="TProcessesBlastdesignVolumeColumns"/>
<include refid="TProcessesDrillingColumns"/>
FROM T_Processes_Drilling a
<include refid="TProcessesDrillingJoins"/>
<where>
${ew.sqlSegment}
</where>
......@@ -76,13 +79,14 @@
<!-- 获取所有getPage列表 -->
<select id="getByUid" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
<select id="getByQuery" resultType="cn.wise.sc.acquisition.business.model.vo.TProcessesDrillingVo">
SELECT
<include refid="TProcessesDiggingHoleColumns"/>
<include refid="TProcessesDrillingColumns"/>
<include refid="TProcessesBlastColumns"/>
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
<include refid="TProcessesBlastdesignVolumeColumns"/>
<include refid="TProcessesDrillingColumns"/>
FROM T_Processes_Drilling a
<include refid="TProcessesDrillingJoins"/>
<where>
${ew.sqlSegment}
</where>
......@@ -92,8 +96,7 @@
<select id="getSumByCondition" resultType="Double">
SELECT
sum(${condition})
FROM T_Processes_Blast a
<include refid="TProcessesBlastdesignHoleJoins"/>
FROM T_Processes_Drilling a
<where>
${ew.sqlSegment}
</where>
......
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TWeightMapper.xml
View file @ 08d7b6c3
......@@ -2,4 +2,15 @@
<!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.TWeightMapper">
<!-- 根据条件求和某字段 -->
<select id="getSumByCondition" resultType="Double">
SELECT
sum(${condition})
FROM T_Weight a
<where>
${ew.sqlSegment}
</where>
</select>
</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