From 69405ab0b17c846692edc5f66a08940ecec297fd Mon Sep 17 00:00:00 2001
From: xvx <871843312@qq.com>
Date: Wed, 7 May 2025 12:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=9F=E5=A4=B1=E4=B8=8E=E8=B4=AB=E5=8C=96?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9=EF=BC=9B=E9=87=87?=
=?UTF-8?q?=E5=89=A5=E9=87=8F=E6=8A=A5=E8=A1=A8=E9=80=9A=E8=BF=87=E6=9C=88?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DicekeTotalMiningController.java | 24 ++++++++-
.../entity/VO/DicekeTotalMiningVo.java | 30 +++++++++++
.../mapper/xml/DicekeMininglossMapper.xml | 1 +
.../service/IDicekeMininglossService.java | 2 +-
.../service/IDicekeTotalMiningService.java | 21 ++++++++
.../impl/DicekeTotalMiningServiceImpl.java | 50 +++++++++++++++++++
6 files changed, 125 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/com/jdc/jdcproject/service/IDicekeTotalMiningService.java
create mode 100644 src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java
diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java
index ba570cb..1133964 100644
--- a/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java
+++ b/src/main/java/com/jdc/jdcproject/controller/DicekeTotalMiningController.java
@@ -1,17 +1,37 @@
package com.jdc.jdcproject.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.jdc.jdcproject.entity.VO.DicekeTotalMiningVo;
+import com.jdc.jdcproject.service.IDicekeTotalMiningService;
+import com.jdc.jdcproject.utils.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.util.List;
/**
*
* 采剥量报表; 前端控制器
*
+ *
+ * @author xvxboo
*/
@RestController
@RequestMapping("/dicekeTotalMining")
public class DicekeTotalMiningController {
+ @Autowired
+ private IDicekeTotalMiningService iDicekeTotalMiningService;
+
+ @Operation(summary = "通过Month查询采剥量报表")
+ @GetMapping("findTotalMiningByMonth")
+ public Result findTotalMiningByMonth(@RequestParam(required = false) LocalDate Month){
+ List totalMiningVoList = iDicekeTotalMiningService.getTotalMiningByMonth(Month);
+ System.out.println(totalMiningVoList.toString());
+ return Result.successResult().data("totalMiningVoList",totalMiningVoList);
+ }
+
}
diff --git a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java
index 570f89b..2f9ee14 100644
--- a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java
+++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeTotalMiningVo.java
@@ -34,5 +34,35 @@ public class DicekeTotalMiningVo {
@Schema(description = "月份")
private LocalDate month;
+ public DicekeTotalMiningVo(String plateRange,
+ String shovelCode,
+ String beizhu,
+ String UOM,
+ Double oreYield,
+ Double strippingTon,
+ Double strippingAndTotalMiningTon,
+ LocalDate month) {
+ this.plateRange = plateRange;
+ this.shovelCode = shovelCode;
+ this.beizhu = beizhu;
+ this.UOM = UOM;
+ OreYield = oreYield;
+ this.strippingTon = strippingTon;
+ this.strippingAndTotalMiningTon = strippingAndTotalMiningTon;
+ this.month = month;
+ }
+ @Override
+ public String toString() {
+ return "DicekeTotalMiningVo{" +
+ "plateRange='" + plateRange + '\'' +
+ ", shovelCode='" + shovelCode + '\'' +
+ ", beizhu='" + beizhu + '\'' +
+ ", UOM='" + UOM + '\'' +
+ ", OreYield=" + OreYield +
+ ", strippingTon=" + strippingTon +
+ ", strippingAndTotalMiningTon=" + strippingAndTotalMiningTon +
+ ", month=" + month +
+ '}';
+ }
}
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 5b3a090..b176f12 100644
--- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml
+++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml
@@ -42,6 +42,7 @@
select dml.LossID,
dp.PlateRange,
ds.ShovelCode,
+ dml.StrippingTon,
dml.StrippingAndTotalMiningTon,
dml.WasteRockTon,
dml.DilutionRate,
diff --git a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java
index c39b376..f8aebcc 100644
--- a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java
+++ b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java
@@ -1,7 +1,7 @@
package com.jdc.jdcproject.service;
-import com.jdc.jdcproject.entity.DicekeMiningloss;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.jdc.jdcproject.entity.DicekeMiningloss;
import com.jdc.jdcproject.entity.VO.DicekeMininglossVo;
import com.jdc.jdcproject.utils.Result;
diff --git a/src/main/java/com/jdc/jdcproject/service/IDicekeTotalMiningService.java b/src/main/java/com/jdc/jdcproject/service/IDicekeTotalMiningService.java
new file mode 100644
index 0000000..a44f430
--- /dev/null
+++ b/src/main/java/com/jdc/jdcproject/service/IDicekeTotalMiningService.java
@@ -0,0 +1,21 @@
+package com.jdc.jdcproject.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jdc.jdcproject.entity.VO.DicekeTotalMiningVo;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ *
+ * 采剥量报表; 服务类
+ *
+ *
+ * @author xvxboo
+ */
+public interface IDicekeTotalMiningService {
+
+ List getTotalMiningByMonth(LocalDate Month);
+
+}
diff --git a/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java b/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java
new file mode 100644
index 0000000..d2ca7ae
--- /dev/null
+++ b/src/main/java/com/jdc/jdcproject/service/impl/DicekeTotalMiningServiceImpl.java
@@ -0,0 +1,50 @@
+package com.jdc.jdcproject.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jdc.jdcproject.entity.DicekeMiningloss;
+import com.jdc.jdcproject.entity.VO.DicekeMininglossVo;
+import com.jdc.jdcproject.entity.VO.DicekeTotalMiningVo;
+import com.jdc.jdcproject.mapper.DicekeMininglossMapper;
+import com.jdc.jdcproject.service.IDicekeTotalMiningService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 采剥量报表; 服务实现类
+ *
+ *
+ * @author xvxboo
+ */
+
+@Service
+public class DicekeTotalMiningServiceImpl extends ServiceImpl implements IDicekeTotalMiningService {
+ @Override
+ public List getTotalMiningByMonth(LocalDate Month) {
+ int year = Month.getYear();
+ int monthV = Month.getMonthValue();
+ List mininglossVoList = baseMapper.findLossByMonth(monthV, year);
+ List totalMiningList = new ArrayList<>();
+ //将mininglossListt赋值给totalMiningList
+ for (DicekeMininglossVo dmlVoLItem : mininglossVoList){
+ String plateR = dmlVoLItem.getPlateRange();
+ String shovelC = dmlVoLItem.getShovelCode();
+ String beiZ = dmlVoLItem.getBeizhu();
+ String uom = "t"; /*单位：吨*/
+ Double oreY = dmlVoLItem.getStrippingAndTotalMiningTon()
+ - dmlVoLItem.getStrippingTon(); /*出矿量 = 采剥总量 - 剥离量*/
+ Double strippingT = dmlVoLItem.getStrippingTon();
+ Double strippingAndTMT = dmlVoLItem.getStrippingAndTotalMiningTon();
+ LocalDate mon = dmlVoLItem.getMonth();
+
+ DicekeTotalMiningVo dtmVoItem = new DicekeTotalMiningVo(plateR,
+ shovelC,beiZ,uom,oreY,strippingT,strippingAndTMT,mon);
+
+ totalMiningList.add(dtmVoItem);
+ }
+ return totalMiningList;
+ }
+}