Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X
This commit is contained in:
@@ -18,6 +18,7 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
|
||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
import org.springframework.web.client.ResourceAccessException;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.ConstraintViolation;
|
||||
@@ -158,6 +159,21 @@ public class GlobalExceptionHandler {
|
||||
return R.fail(message);
|
||||
}
|
||||
|
||||
/**
|
||||
* 二级系统(L2)连接失败
|
||||
*/
|
||||
@ExceptionHandler(ResourceAccessException.class)
|
||||
public R<Void> handleResourceAccessException(ResourceAccessException e, HttpServletRequest request) {
|
||||
String requestURI = request.getRequestURI();
|
||||
String message = e.getMessage();
|
||||
if (message != null && (message.contains("Connection refused") || message.contains("sql-server-api"))) {
|
||||
log.error("请求地址'{}', 二级系统连接失败'{}'", requestURI, message);
|
||||
return R.fail(503, "二级系统状态异常,已停机,请稍后重试或联系管理员确认");
|
||||
}
|
||||
log.error("请求地址'{}', 资源访问异常", requestURI, e);
|
||||
return R.fail("服务连接异常,请稍后重试");
|
||||
}
|
||||
|
||||
/**
|
||||
* 演示模式异常
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.mes.qc.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.mes.qc.domain.vo.QcChemicalItemVo;
|
||||
import com.klp.mes.qc.domain.bo.QcChemicalItemBo;
|
||||
import com.klp.mes.qc.service.IQcChemicalItemService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/qc/chemicalItem")
|
||||
public class QcChemicalItemController extends BaseController {
|
||||
|
||||
private final IQcChemicalItemService iQcChemicalItemService;
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<QcChemicalItemVo> list(QcChemicalItemBo bo, PageQuery pageQuery) {
|
||||
return iQcChemicalItemService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出质量的化学成分明细列表
|
||||
*/
|
||||
@Log(title = "质量的化学成分明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(QcChemicalItemBo bo, HttpServletResponse response) {
|
||||
List<QcChemicalItemVo> list = iQcChemicalItemService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "质量的化学成分明细", QcChemicalItemVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取质量的化学成分明细详细信息
|
||||
*
|
||||
* @param itemId 主键
|
||||
*/
|
||||
@GetMapping("/{itemId}")
|
||||
public R<QcChemicalItemVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long itemId) {
|
||||
return R.ok(iQcChemicalItemService.queryById(itemId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质量的化学成分明细
|
||||
*/
|
||||
@Log(title = "质量的化学成分明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody QcChemicalItemBo bo) {
|
||||
return toAjax(iQcChemicalItemService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质量的化学成分明细
|
||||
*/
|
||||
@Log(title = "质量的化学成分明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody QcChemicalItemBo bo) {
|
||||
return toAjax(iQcChemicalItemService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除质量的化学成分明细
|
||||
*
|
||||
* @param itemIds 主键串
|
||||
*/
|
||||
@Log(title = "质量的化学成分明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{itemIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] itemIds) {
|
||||
return toAjax(iQcChemicalItemService.deleteWithValidByIds(Arrays.asList(itemIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.mes.qc.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.mes.qc.domain.vo.QcPhysicalItemVo;
|
||||
import com.klp.mes.qc.domain.bo.QcPhysicalItemBo;
|
||||
import com.klp.mes.qc.service.IQcPhysicalItemService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 物理性能明细
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/qc/physicalItem")
|
||||
public class QcPhysicalItemController extends BaseController {
|
||||
|
||||
private final IQcPhysicalItemService iQcPhysicalItemService;
|
||||
|
||||
/**
|
||||
* 查询物理性能明细列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<QcPhysicalItemVo> list(QcPhysicalItemBo bo, PageQuery pageQuery) {
|
||||
return iQcPhysicalItemService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出物理性能明细列表
|
||||
*/
|
||||
@Log(title = "物理性能明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(QcPhysicalItemBo bo, HttpServletResponse response) {
|
||||
List<QcPhysicalItemVo> list = iQcPhysicalItemService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "物理性能明细", QcPhysicalItemVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取物理性能明细详细信息
|
||||
*
|
||||
* @param physicalId 主键
|
||||
*/
|
||||
@GetMapping("/{physicalId}")
|
||||
public R<QcPhysicalItemVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long physicalId) {
|
||||
return R.ok(iQcPhysicalItemService.queryById(physicalId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增物理性能明细
|
||||
*/
|
||||
@Log(title = "物理性能明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody QcPhysicalItemBo bo) {
|
||||
return toAjax(iQcPhysicalItemService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物理性能明细
|
||||
*/
|
||||
@Log(title = "物理性能明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody QcPhysicalItemBo bo) {
|
||||
return toAjax(iQcPhysicalItemService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除物理性能明细
|
||||
*
|
||||
* @param physicalIds 主键串
|
||||
*/
|
||||
@Log(title = "物理性能明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{physicalIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] physicalIds) {
|
||||
return toAjax(iQcPhysicalItemService.deleteWithValidByIds(Arrays.asList(physicalIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package com.klp.mes.qc.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细对象 qc_chemical_item
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("qc_chemical_item")
|
||||
public class QcChemicalItem extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 明细ID
|
||||
*/
|
||||
@TableId(value = "item_id")
|
||||
private Long itemId;
|
||||
/**
|
||||
* 证书ID
|
||||
*/
|
||||
private Long certificateId;
|
||||
/**
|
||||
* 钢卷号
|
||||
*/
|
||||
private String coilNo;
|
||||
/**
|
||||
* 炉号
|
||||
*/
|
||||
private String heatNo;
|
||||
/**
|
||||
* 碳(%)
|
||||
*/
|
||||
private BigDecimal c;
|
||||
/**
|
||||
* 硅(%)
|
||||
*/
|
||||
private BigDecimal si;
|
||||
/**
|
||||
* 锰(%)
|
||||
*/
|
||||
private BigDecimal mn;
|
||||
/**
|
||||
* 磷(%)
|
||||
*/
|
||||
private BigDecimal p;
|
||||
/**
|
||||
* 硫(%)
|
||||
*/
|
||||
private BigDecimal s;
|
||||
/**
|
||||
* 酸溶铝(%)
|
||||
*/
|
||||
private BigDecimal als;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
package com.klp.mes.qc.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 物理性能明细对象 qc_physical_item
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("qc_physical_item")
|
||||
public class QcPhysicalItem extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 物理性能ID
|
||||
*/
|
||||
@TableId(value = "physical_id")
|
||||
private Long physicalId;
|
||||
/**
|
||||
* 证书ID
|
||||
*/
|
||||
private Long certificateId;
|
||||
/**
|
||||
* 钢卷号(关联化学成分表)
|
||||
*/
|
||||
private String coilNo;
|
||||
/**
|
||||
* 拉伸试验-屈服强度(MPa)
|
||||
*/
|
||||
private BigDecimal yieldStrength;
|
||||
/**
|
||||
* 拉伸试验-抗拉强度(MPa)
|
||||
*/
|
||||
private BigDecimal tensileStrength;
|
||||
/**
|
||||
* 拉伸试验-伸长率(%)
|
||||
*/
|
||||
private BigDecimal elongation;
|
||||
/**
|
||||
* 硬度实验(HRB)
|
||||
*/
|
||||
private BigDecimal hardness;
|
||||
/**
|
||||
* 弯曲试验
|
||||
*/
|
||||
private String bendingTest;
|
||||
/**
|
||||
* 表面质量
|
||||
*/
|
||||
private String surfaceQuality;
|
||||
/**
|
||||
* 表面结构
|
||||
*/
|
||||
private String surfaceStructure;
|
||||
/**
|
||||
* 边缘状态
|
||||
*/
|
||||
private String edgeStatus;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package com.klp.mes.qc.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细业务对象 qc_chemical_item
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class QcChemicalItemBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 明细ID
|
||||
*/
|
||||
private Long itemId;
|
||||
|
||||
/**
|
||||
* 证书ID
|
||||
*/
|
||||
private Long certificateId;
|
||||
|
||||
/**
|
||||
* 钢卷号
|
||||
*/
|
||||
private String coilNo;
|
||||
|
||||
/**
|
||||
* 炉号
|
||||
*/
|
||||
private String heatNo;
|
||||
|
||||
/**
|
||||
* 碳(%)
|
||||
*/
|
||||
private BigDecimal c;
|
||||
|
||||
/**
|
||||
* 硅(%)
|
||||
*/
|
||||
private BigDecimal si;
|
||||
|
||||
/**
|
||||
* 锰(%)
|
||||
*/
|
||||
private BigDecimal mn;
|
||||
|
||||
/**
|
||||
* 磷(%)
|
||||
*/
|
||||
private BigDecimal p;
|
||||
|
||||
/**
|
||||
* 硫(%)
|
||||
*/
|
||||
private BigDecimal s;
|
||||
|
||||
/**
|
||||
* 酸溶铝(%)
|
||||
*/
|
||||
private BigDecimal als;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
package com.klp.mes.qc.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 物理性能明细业务对象 qc_physical_item
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class QcPhysicalItemBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 物理性能ID
|
||||
*/
|
||||
private Long physicalId;
|
||||
|
||||
/**
|
||||
* 证书ID
|
||||
*/
|
||||
private Long certificateId;
|
||||
|
||||
/**
|
||||
* 钢卷号(关联化学成分表)
|
||||
*/
|
||||
private String coilNo;
|
||||
|
||||
/**
|
||||
* 拉伸试验-屈服强度(MPa)
|
||||
*/
|
||||
private BigDecimal yieldStrength;
|
||||
|
||||
/**
|
||||
* 拉伸试验-抗拉强度(MPa)
|
||||
*/
|
||||
private BigDecimal tensileStrength;
|
||||
|
||||
/**
|
||||
* 拉伸试验-伸长率(%)
|
||||
*/
|
||||
private BigDecimal elongation;
|
||||
|
||||
/**
|
||||
* 硬度实验(HRB)
|
||||
*/
|
||||
private BigDecimal hardness;
|
||||
|
||||
/**
|
||||
* 弯曲试验
|
||||
*/
|
||||
private String bendingTest;
|
||||
|
||||
/**
|
||||
* 表面质量
|
||||
*/
|
||||
private String surfaceQuality;
|
||||
|
||||
/**
|
||||
* 表面结构
|
||||
*/
|
||||
private String surfaceStructure;
|
||||
|
||||
/**
|
||||
* 边缘状态
|
||||
*/
|
||||
private String edgeStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package com.klp.mes.qc.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细视图对象 qc_chemical_item
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class QcChemicalItemVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 明细ID
|
||||
*/
|
||||
@ExcelProperty(value = "明细ID")
|
||||
private Long itemId;
|
||||
|
||||
/**
|
||||
* 证书ID
|
||||
*/
|
||||
@ExcelProperty(value = "证书ID")
|
||||
private Long certificateId;
|
||||
|
||||
/**
|
||||
* 钢卷号
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷号")
|
||||
private String coilNo;
|
||||
|
||||
/**
|
||||
* 炉号
|
||||
*/
|
||||
@ExcelProperty(value = "炉号")
|
||||
private String heatNo;
|
||||
|
||||
/**
|
||||
* 碳(%)
|
||||
*/
|
||||
@ExcelProperty(value = "碳(%)")
|
||||
private BigDecimal c;
|
||||
|
||||
/**
|
||||
* 硅(%)
|
||||
*/
|
||||
@ExcelProperty(value = "硅(%)")
|
||||
private BigDecimal si;
|
||||
|
||||
/**
|
||||
* 锰(%)
|
||||
*/
|
||||
@ExcelProperty(value = "锰(%)")
|
||||
private BigDecimal mn;
|
||||
|
||||
/**
|
||||
* 磷(%)
|
||||
*/
|
||||
@ExcelProperty(value = "磷(%)")
|
||||
private BigDecimal p;
|
||||
|
||||
/**
|
||||
* 硫(%)
|
||||
*/
|
||||
@ExcelProperty(value = "硫(%)")
|
||||
private BigDecimal s;
|
||||
|
||||
/**
|
||||
* 酸溶铝(%)
|
||||
*/
|
||||
@ExcelProperty(value = "酸溶铝(%)")
|
||||
private BigDecimal als;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package com.klp.mes.qc.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 物理性能明细视图对象 qc_physical_item
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class QcPhysicalItemVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 物理性能ID
|
||||
*/
|
||||
@ExcelProperty(value = "物理性能ID")
|
||||
private Long physicalId;
|
||||
|
||||
/**
|
||||
* 证书ID
|
||||
*/
|
||||
@ExcelProperty(value = "证书ID")
|
||||
private Long certificateId;
|
||||
|
||||
/**
|
||||
* 钢卷号(关联化学成分表)
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷号(关联化学成分表)")
|
||||
private String coilNo;
|
||||
|
||||
/**
|
||||
* 拉伸试验-屈服强度(MPa)
|
||||
*/
|
||||
@ExcelProperty(value = "拉伸试验-屈服强度(MPa)")
|
||||
private BigDecimal yieldStrength;
|
||||
|
||||
/**
|
||||
* 拉伸试验-抗拉强度(MPa)
|
||||
*/
|
||||
@ExcelProperty(value = "拉伸试验-抗拉强度(MPa)")
|
||||
private BigDecimal tensileStrength;
|
||||
|
||||
/**
|
||||
* 拉伸试验-伸长率(%)
|
||||
*/
|
||||
@ExcelProperty(value = "拉伸试验-伸长率(%)")
|
||||
private BigDecimal elongation;
|
||||
|
||||
/**
|
||||
* 硬度实验(HRB)
|
||||
*/
|
||||
@ExcelProperty(value = "硬度实验(HRB)")
|
||||
private BigDecimal hardness;
|
||||
|
||||
/**
|
||||
* 弯曲试验
|
||||
*/
|
||||
@ExcelProperty(value = "弯曲试验")
|
||||
private String bendingTest;
|
||||
|
||||
/**
|
||||
* 表面质量
|
||||
*/
|
||||
@ExcelProperty(value = "表面质量")
|
||||
private String surfaceQuality;
|
||||
|
||||
/**
|
||||
* 表面结构
|
||||
*/
|
||||
@ExcelProperty(value = "表面结构")
|
||||
private String surfaceStructure;
|
||||
|
||||
/**
|
||||
* 边缘状态
|
||||
*/
|
||||
@ExcelProperty(value = "边缘状态")
|
||||
private String edgeStatus;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mes.qc.mapper;
|
||||
|
||||
import com.klp.mes.qc.domain.QcChemicalItem;
|
||||
import com.klp.mes.qc.domain.vo.QcChemicalItemVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
public interface QcChemicalItemMapper extends BaseMapperPlus<QcChemicalItemMapper, QcChemicalItem, QcChemicalItemVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mes.qc.mapper;
|
||||
|
||||
import com.klp.mes.qc.domain.QcPhysicalItem;
|
||||
import com.klp.mes.qc.domain.vo.QcPhysicalItemVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 物理性能明细Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
public interface QcPhysicalItemMapper extends BaseMapperPlus<QcPhysicalItemMapper, QcPhysicalItem, QcPhysicalItemVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.mes.qc.service;
|
||||
|
||||
import com.klp.mes.qc.domain.QcChemicalItem;
|
||||
import com.klp.mes.qc.domain.vo.QcChemicalItemVo;
|
||||
import com.klp.mes.qc.domain.bo.QcChemicalItemBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细Service接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
public interface IQcChemicalItemService {
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细
|
||||
*/
|
||||
QcChemicalItemVo queryById(Long itemId);
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细列表
|
||||
*/
|
||||
TableDataInfo<QcChemicalItemVo> queryPageList(QcChemicalItemBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细列表
|
||||
*/
|
||||
List<QcChemicalItemVo> queryList(QcChemicalItemBo bo);
|
||||
|
||||
/**
|
||||
* 新增质量的化学成分明细
|
||||
*/
|
||||
Boolean insertByBo(QcChemicalItemBo bo);
|
||||
|
||||
/**
|
||||
* 修改质量的化学成分明细
|
||||
*/
|
||||
Boolean updateByBo(QcChemicalItemBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除质量的化学成分明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.mes.qc.service;
|
||||
|
||||
import com.klp.mes.qc.domain.QcPhysicalItem;
|
||||
import com.klp.mes.qc.domain.vo.QcPhysicalItemVo;
|
||||
import com.klp.mes.qc.domain.bo.QcPhysicalItemBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物理性能明细Service接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
public interface IQcPhysicalItemService {
|
||||
|
||||
/**
|
||||
* 查询物理性能明细
|
||||
*/
|
||||
QcPhysicalItemVo queryById(Long physicalId);
|
||||
|
||||
/**
|
||||
* 查询物理性能明细列表
|
||||
*/
|
||||
TableDataInfo<QcPhysicalItemVo> queryPageList(QcPhysicalItemBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询物理性能明细列表
|
||||
*/
|
||||
List<QcPhysicalItemVo> queryList(QcPhysicalItemBo bo);
|
||||
|
||||
/**
|
||||
* 新增物理性能明细
|
||||
*/
|
||||
Boolean insertByBo(QcPhysicalItemBo bo);
|
||||
|
||||
/**
|
||||
* 修改物理性能明细
|
||||
*/
|
||||
Boolean updateByBo(QcPhysicalItemBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除物理性能明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
package com.klp.mes.qc.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.mes.qc.domain.bo.QcChemicalItemBo;
|
||||
import com.klp.mes.qc.domain.vo.QcChemicalItemVo;
|
||||
import com.klp.mes.qc.domain.QcChemicalItem;
|
||||
import com.klp.mes.qc.mapper.QcChemicalItemMapper;
|
||||
import com.klp.mes.qc.service.IQcChemicalItemService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 质量的化学成分明细Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class QcChemicalItemServiceImpl implements IQcChemicalItemService {
|
||||
|
||||
private final QcChemicalItemMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细
|
||||
*/
|
||||
@Override
|
||||
public QcChemicalItemVo queryById(Long itemId){
|
||||
return baseMapper.selectVoById(itemId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<QcChemicalItemVo> queryPageList(QcChemicalItemBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<QcChemicalItem> lqw = buildQueryWrapper(bo);
|
||||
Page<QcChemicalItemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询质量的化学成分明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<QcChemicalItemVo> queryList(QcChemicalItemBo bo) {
|
||||
LambdaQueryWrapper<QcChemicalItem> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<QcChemicalItem> buildQueryWrapper(QcChemicalItemBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<QcChemicalItem> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getCertificateId() != null, QcChemicalItem::getCertificateId, bo.getCertificateId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcChemicalItem::getCoilNo, bo.getCoilNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getHeatNo()), QcChemicalItem::getHeatNo, bo.getHeatNo());
|
||||
lqw.eq(bo.getC() != null, QcChemicalItem::getC, bo.getC());
|
||||
lqw.eq(bo.getSi() != null, QcChemicalItem::getSi, bo.getSi());
|
||||
lqw.eq(bo.getMn() != null, QcChemicalItem::getMn, bo.getMn());
|
||||
lqw.eq(bo.getP() != null, QcChemicalItem::getP, bo.getP());
|
||||
lqw.eq(bo.getS() != null, QcChemicalItem::getS, bo.getS());
|
||||
lqw.eq(bo.getAls() != null, QcChemicalItem::getAls, bo.getAls());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质量的化学成分明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(QcChemicalItemBo bo) {
|
||||
QcChemicalItem add = BeanUtil.toBean(bo, QcChemicalItem.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setItemId(add.getItemId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质量的化学成分明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(QcChemicalItemBo bo) {
|
||||
QcChemicalItem update = BeanUtil.toBean(bo, QcChemicalItem.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(QcChemicalItem entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除质量的化学成分明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,118 @@
|
||||
package com.klp.mes.qc.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.mes.qc.domain.bo.QcPhysicalItemBo;
|
||||
import com.klp.mes.qc.domain.vo.QcPhysicalItemVo;
|
||||
import com.klp.mes.qc.domain.QcPhysicalItem;
|
||||
import com.klp.mes.qc.mapper.QcPhysicalItemMapper;
|
||||
import com.klp.mes.qc.service.IQcPhysicalItemService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 物理性能明细Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-05-18
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService {
|
||||
|
||||
private final QcPhysicalItemMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询物理性能明细
|
||||
*/
|
||||
@Override
|
||||
public QcPhysicalItemVo queryById(Long physicalId){
|
||||
return baseMapper.selectVoById(physicalId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询物理性能明细列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<QcPhysicalItemVo> queryPageList(QcPhysicalItemBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<QcPhysicalItem> lqw = buildQueryWrapper(bo);
|
||||
Page<QcPhysicalItemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询物理性能明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<QcPhysicalItemVo> queryList(QcPhysicalItemBo bo) {
|
||||
LambdaQueryWrapper<QcPhysicalItem> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<QcPhysicalItem> buildQueryWrapper(QcPhysicalItemBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<QcPhysicalItem> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getCertificateId() != null, QcPhysicalItem::getCertificateId, bo.getCertificateId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcPhysicalItem::getCoilNo, bo.getCoilNo());
|
||||
lqw.eq(bo.getYieldStrength() != null, QcPhysicalItem::getYieldStrength, bo.getYieldStrength());
|
||||
lqw.eq(bo.getTensileStrength() != null, QcPhysicalItem::getTensileStrength, bo.getTensileStrength());
|
||||
lqw.eq(bo.getElongation() != null, QcPhysicalItem::getElongation, bo.getElongation());
|
||||
lqw.eq(bo.getHardness() != null, QcPhysicalItem::getHardness, bo.getHardness());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcPhysicalItem::getBendingTest, bo.getBendingTest());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcPhysicalItem::getSurfaceQuality, bo.getSurfaceQuality());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcPhysicalItem::getSurfaceStructure, bo.getSurfaceStructure());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcPhysicalItem::getEdgeStatus, bo.getEdgeStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增物理性能明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(QcPhysicalItemBo bo) {
|
||||
QcPhysicalItem add = BeanUtil.toBean(bo, QcPhysicalItem.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setPhysicalId(add.getPhysicalId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物理性能明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(QcPhysicalItemBo bo) {
|
||||
QcPhysicalItem update = BeanUtil.toBean(bo, QcPhysicalItem.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(QcPhysicalItem entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除物理性能明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
<?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.klp.mes.qc.mapper.QcChemicalItemMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.qc.domain.QcChemicalItem" id="QcChemicalItemResult">
|
||||
<result property="itemId" column="item_id"/>
|
||||
<result property="certificateId" column="certificate_id"/>
|
||||
<result property="coilNo" column="coil_no"/>
|
||||
<result property="heatNo" column="heat_no"/>
|
||||
<result property="c" column="c"/>
|
||||
<result property="si" column="si"/>
|
||||
<result property="mn" column="mn"/>
|
||||
<result property="p" column="p"/>
|
||||
<result property="s" column="s"/>
|
||||
<result property="als" column="als"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,28 @@
|
||||
<?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.klp.mes.qc.mapper.QcPhysicalItemMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.qc.domain.QcPhysicalItem" id="QcPhysicalItemResult">
|
||||
<result property="physicalId" column="physical_id"/>
|
||||
<result property="certificateId" column="certificate_id"/>
|
||||
<result property="coilNo" column="coil_no"/>
|
||||
<result property="yieldStrength" column="yield_strength"/>
|
||||
<result property="tensileStrength" column="tensile_strength"/>
|
||||
<result property="elongation" column="elongation"/>
|
||||
<result property="hardness" column="hardness"/>
|
||||
<result property="bendingTest" column="bending_test"/>
|
||||
<result property="surfaceQuality" column="surface_quality"/>
|
||||
<result property="surfaceStructure" column="surface_structure"/>
|
||||
<result property="edgeStatus" column="edge_status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user