diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java index 35b4b7f..9f9e0e4 100644 --- a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java +++ b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java @@ -1,8 +1,15 @@ package com.jdc.jdcproject.controller; -import org.springframework.web.bind.annotation.RequestMapping; +import com.jdc.jdcproject.entity.DicekeMiningloss; +import com.jdc.jdcproject.service.IDicekeMininglossService; +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 org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; +import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; + +import java.util.List; /** *

@@ -16,4 +23,44 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/dicekeMiningloss") public class DicekeMininglossController { + @Autowired + private IDicekeMininglossService dicekeMininglossService; + + @Operation(summary = "查询损失和贫化报表") + @GetMapping("findAllMininggloss") + public Result findAll(){ + List dicekeMininglossVoList = dicekeMininglossService.findAll(); + System.out.println(dicekeMininglossVoList.toString()); + return Result.successResult().data("dicekeMininglossVoList", dicekeMininglossVoList); + } + + @Operation(summary = "修改损失和贫化信息") + @PostMapping("updatedicekeMiningloss") + public Result updateLoss(@RequestBody DicekeMiningloss dicekeMiningloss){ + boolean updateflag = dicekeMininglossService.updateById(dicekeMiningloss); + if (updateflag){ + return Result.successResult(); + } else { + return Result.errorResult(); + } + } + + @Operation(summary = "删除损失和贫化信息") + @DeleteMapping("deletedicekeMiningloss/{lossID}") + public Result deletedicekeMiningloss(@PathVariable String lossID){ + boolean updateflag = dicekeMininglossService.removeById(lossID); + if(updateflag){ + return Result.successResult(); + } else { + return Result.errorResult(); + } + } + + @Operation(summary = "根据id查询损失和贫化信息") + @GetMapping("finddicekeMininglossById/{lossID}") + public Result finddicekeMininglossByID(@PathVariable String lossID){ + DicekeMiningloss lossById = dicekeMininglossService.getById(lossID); + return Result.successResult().data("dicekeMininglossServiceById",lossById); + } + } diff --git a/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java new file mode 100644 index 0000000..3d1f867 --- /dev/null +++ b/src/main/java/com/jdc/jdcproject/entity/VO/DicekeMininglossVo.java @@ -0,0 +1,76 @@ +package com.jdc.jdcproject.entity.VO; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +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 { + + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + @TableId("LossID") + private String lossID; + + @Schema(description = "平盘名称") + private String plateRange; + + @Schema(description = "铲号") + private String shovelCode; + + @Schema(description = "月份") + private LocalDate month; + + @Schema(description = "剥离量(吨)") + private Double strippingTon; + + @Schema(description = "采剥总量(吨)") + private Double strippingAndTotalMiningTon; + + @Schema(description = "采下废石(吨)") + private Double wasteRockTon; + + @Schema(description = "贫化率(%)") + private Double dilutionRate; + + @Schema(description = "损失率(%)") + private Double lossRate; + + @Schema(description = "配矿配矿量(吨)") + private Double allocationTon; + + @Schema(description = "备注") + private String beizhu; + + @Override + public String toString() { + return "DicekeMiningloss{" + + "lossID = " + lossID + + ", plateID = " + plateRange + + ", shovelID = " + shovelCode + + ", month = " + month + + ", strippingTon = " + strippingTon + + ", strippingAndTotalMiningTon = " + strippingAndTotalMiningTon + + ", wasteRockTon = " + wasteRockTon + + ", dilutionRate = " + dilutionRate + + ", lossRate = " + lossRate + + ", allocationTon = " + allocationTon + + ", beizhu = " + beizhu + + "}"; + } +} diff --git a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java index 942a284..602af93 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java +++ b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java @@ -2,8 +2,11 @@ package com.jdc.jdcproject.mapper; import com.jdc.jdcproject.entity.DicekeMiningloss; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** *

* 采剥与贫损表; Mapper 接口 @@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DicekeMininglossMapper extends BaseMapper { + List findAll(); } 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 25854fa..44d87a9 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml +++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml @@ -2,4 +2,22 @@ + + + diff --git a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java index 292891a..e16266d 100644 --- a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java +++ b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java @@ -2,6 +2,9 @@ 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 java.util.List; /** *

@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IDicekeMininglossService extends IService { + List findAll(); } 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 cc873b9..f86189e 100644 --- a/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java +++ b/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java @@ -1,11 +1,14 @@ package com.jdc.jdcproject.service.impl; import com.jdc.jdcproject.entity.DicekeMiningloss; +import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; import com.jdc.jdcproject.mapper.DicekeMininglossMapper; import com.jdc.jdcproject.service.IDicekeMininglossService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 采剥与贫损表; 服务实现类 @@ -17,4 +20,8 @@ import org.springframework.stereotype.Service; @Service public class DicekeMininglossServiceImpl extends ServiceImpl implements IDicekeMininglossService { + @Override + public List findAll() { + return baseMapper.findAll(); + } }