From 4d2c9a251960c75dcbcc0c6404db0c31b4375e5f Mon Sep 17 00:00:00 2001 From: xvx <871843312@qq.com> Date: Mon, 5 May 2025 01:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=9F=E5=A4=B1=E5=92=8C=E8=B4=AB=E5=8C=96?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DicekeMininglossController.java | 29 +++++++-- .../entity/VO/DicekeMininglossVo.java | 12 +--- .../mapper/DicekeMininglossMapper.java | 3 +- .../mapper/xml/DicekeMininglossMapper.xml | 3 +- .../service/IDicekeMininglossService.java | 5 +- .../impl/DicekeMininglossServiceImpl.java | 65 ++++++++++++++++++- 6 files changed, 96 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java index 9f9e0e4..702ff82 100644 --- a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java +++ b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java @@ -1,7 +1,12 @@ package com.jdc.jdcproject.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jdc.jdcproject.entity.DicekeMiningloss; +import com.jdc.jdcproject.entity.DicekePlatearea; +import com.jdc.jdcproject.entity.DicekeShovel; import com.jdc.jdcproject.service.IDicekeMininglossService; +import com.jdc.jdcproject.service.IDicekePlateareaService; +import com.jdc.jdcproject.service.IDicekeShovelService; import com.jdc.jdcproject.utils.Result; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; @@ -28,8 +33,8 @@ public class DicekeMininglossController { @Operation(summary = "查询损失和贫化报表") @GetMapping("findAllMininggloss") - public Result findAll(){ - List dicekeMininglossVoList = dicekeMininglossService.findAll(); + public Result findAllLoss(){ + List dicekeMininglossVoList = dicekeMininglossService.findAllLoss(); System.out.println(dicekeMininglossVoList.toString()); return Result.successResult().data("dicekeMininglossVoList", dicekeMininglossVoList); } @@ -47,7 +52,7 @@ public class DicekeMininglossController { @Operation(summary = "删除损失和贫化信息") @DeleteMapping("deletedicekeMiningloss/{lossID}") - public Result deletedicekeMiningloss(@PathVariable String lossID){ + public Result deleteLoss(@PathVariable String lossID){ boolean updateflag = dicekeMininglossService.removeById(lossID); if(updateflag){ return Result.successResult(); @@ -58,9 +63,25 @@ public class DicekeMininglossController { @Operation(summary = "根据id查询损失和贫化信息") @GetMapping("finddicekeMininglossById/{lossID}") - public Result finddicekeMininglossByID(@PathVariable String lossID){ + public Result findLossByID(@PathVariable String lossID){ DicekeMiningloss lossById = dicekeMininglossService.getById(lossID); return Result.successResult().data("dicekeMininglossServiceById",lossById); } + @Operation(summary = "新增损失和贫化信息") + @PostMapping("savedicekeMiningloss") + public Result saveLoss(@RequestBody DicekeMininglossVo dicekeMininglossVo){ + + int savedml = dicekeMininglossService.savedml(dicekeMininglossVo); + + if(savedml == 1) { + return Result.errorResult().data("平盘不存在",savedml); + } else if (savedml == 2) { + return Result.errorResult().data("电铲不存在",savedml); + } else { + return Result.successResult(); + } + + } + } diff --git a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java index 3d1f867..136530b 100644 --- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java +++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java @@ -8,18 +8,8 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDate; -/** - *

- * 采剥与贫损表; - *

- * - * @author haoyanlu - * @since 2025-04-26 - */ -@TableName("diceke_miningloss") -@Schema(name = "DicekeMiningloss", description = "采剥与贫损表;") @Data -public class DicekeMininglossVo implements Serializable { +public class DicekeMininglossVo { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java index 602af93..e0e3ac8 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java +++ b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java @@ -18,5 +18,6 @@ import java.util.List; @Mapper public interface DicekeMininglossMapper extends BaseMapper { - List findAll(); + List findAllLoss(); + } diff --git a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml index 44d87a9..cb53871 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml +++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml @@ -3,7 +3,7 @@ - select dml.LossID, dp.PlateRange, ds.ShovelCode, @@ -19,5 +19,4 @@ LEFT JOIN diceke_platearea dp ON dml.PlateID = dp.PlateID LEFT JOIN diceke_shovel ds ON dml.ShovelID = ds.ShovelID - diff --git a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java index e16266d..0bc0e29 100644 --- a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java +++ b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java @@ -3,6 +3,7 @@ package com.jdc.jdcproject.service; import com.jdc.jdcproject.entity.DicekeMiningloss; import com.baomidou.mybatisplus.extension.service.IService; import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; +import com.jdc.jdcproject.utils.Result; import java.util.List; @@ -16,5 +17,7 @@ import java.util.List; */ public interface IDicekeMininglossService extends IService { - List findAll(); + List findAllLoss(); + + int savedml(DicekeMininglossVo dicekeMininglossVo); } diff --git a/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java b/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java index f86189e..c93c826 100644 --- a/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java +++ b/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java @@ -1,10 +1,19 @@ package com.jdc.jdcproject.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jdc.jdcproject.entity.DicekeMiningloss; +import com.jdc.jdcproject.entity.DicekePlatearea; +import com.jdc.jdcproject.entity.DicekeShovel; import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; import com.jdc.jdcproject.mapper.DicekeMininglossMapper; +import com.jdc.jdcproject.mapper.DicekePlateareaMapper; +import com.jdc.jdcproject.mapper.DicekeShovelMapper; import com.jdc.jdcproject.service.IDicekeMininglossService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jdc.jdcproject.service.IDicekePlateareaService; +import com.jdc.jdcproject.service.IDicekeShovelService; +import com.jdc.jdcproject.utils.Result; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,8 +29,60 @@ import java.util.List; @Service public class DicekeMininglossServiceImpl extends ServiceImpl implements IDicekeMininglossService { + @Autowired + private DicekeMininglossMapper dicekeMininglossMapper; + @Autowired + private DicekeShovelMapper dicekeShovelMapper; + @Autowired + private DicekePlateareaMapper dicekePlateareaMapper; + @Override - public List findAll() { - return baseMapper.findAll(); + public List findAllLoss() { + return baseMapper.findAllLoss(); } + + @Override + public int savedml(DicekeMininglossVo dicekeMininglossVo) { + /* + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("plateRange",dicekeMininglossVo.getPlateRange()); + DicekePlatearea dp = dicekePlateareaService.getOne(queryWrapper); + */ + + //平盘和电铲查找单独一个工具类（使用次数多） + DicekePlatearea dp = dicekePlateareaMapper.selectOne( + new QueryWrapper().eq("plateRange", dicekeMininglossVo.getPlateRange()) + ); + System.out.println(dp); + if (dp == null){ + return 1; + } + + //不确定是否是数据库表的问题 报错 + DicekeShovel ds = dicekeShovelMapper.selectOne( + new QueryWrapper().eq("shovelCode", dicekeMininglossVo.getShovelCode()) + ); + System.out.println(ds); + if (ds == null){ + // return Result.errorResult().data("电铲不存在",ds); + return 2; + } + + //构建报表实体 + //Loss的id生成 + DicekeMiningloss dml = new DicekeMiningloss(); + dml.setShovelID(ds.getShovelID()); + dml.setPlateID(dp.getPlateID()); + dml.setMonth(dicekeMininglossVo.getMonth()); + dml.setStrippingTon(dicekeMininglossVo.getStrippingTon()); + dml.setStrippingAndTotalMiningTon(dicekeMininglossVo.getStrippingAndTotalMiningTon()); + dml.setWasteRockTon(dicekeMininglossVo.getWasteRockTon()); + dml.setDilutionRate(dicekeMininglossVo.getDilutionRate()); + dml.setLossRate(dicekeMininglossVo.getLossRate()); + dml.setAllocationTon(dicekeMininglossVo.getAllocationTon()); + dicekeMininglossMapper.insert(dml); + //时间戳接收前端传还是后端获取 + return 20000; + } + }