From 53e0f1b6c0f9cfa69147d783c4ae9aac6e38f5f3 Mon Sep 17 00:00:00 2001 From: xvx <871843312@qq.com> Date: Mon, 19 May 2025 18:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9,=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=AB=E5=8C=96=E8=A1=A8=E7=9A=84=E5=88=86=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AC=E6=9C=88=E6=88=96=E4=B8=8A=E6=9C=88?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DicekeMininglossController.java | 46 +++++++++++++------ .../mapper/DicekeMininglossMapper.java | 3 +- .../mapper/xml/DicekeMininglossMapper.xml | 19 ++++++++ .../service/IDicekeMininglossService.java | 10 +++- .../impl/DicekeMininglossServiceImpl.java | 36 +++++++++++---- .../java/com/jdc/jdcproject/utils/MD5.java | 2 +- 6 files changed, 88 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java index c47916e..442682f 100644 --- a/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java +++ b/src/main/java/com/jdc/jdcproject/controller/DicekeMininglossController.java @@ -1,6 +1,7 @@ package com.jdc.jdcproject.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jdc.jdcproject.entity.DicekeMiningloss; import com.jdc.jdcproject.entity.DicekePlatearea; import com.jdc.jdcproject.entity.DicekeShovel; @@ -34,18 +35,36 @@ public class DicekeMininglossController { private IDicekeMininglossService dicekeMininglossService; @Operation(summary = "查询损失和贫化报表") - @GetMapping("findAllMininggloss") + @GetMapping("findAllMiningloss") public Result findAllLoss(){ List dicekeMininglossVoList = dicekeMininglossService.findAllLoss(); System.out.println(dicekeMininglossVoList.toString()); return Result.successResult().data("dicekeMininglossVoList", dicekeMininglossVoList); } + @Operation(summary = "分页查询") + @GetMapping("lossPageList") + public Result lossPageList(@RequestParam(defaultValue = "1") int pageNum){ + return Result.successResult().data("Page",dicekeMininglossService.getPage(pageNum)); + } + + @Operation(summary = "查当前或上一个月") + @GetMapping("findMonth") + public Result findMonth() { + + LocalDate currentDate = LocalDate.now(); + + List LossMonthList = dicekeMininglossService.getLossByMonth(currentDate); + + System.out.println(LossMonthList.toString()); + return Result.successResult().data("LossMonthVoList", LossMonthList); + + } @Operation(summary = "通过Month查询损失和贫化报表") @GetMapping("findLossByMonth") public Result findLossByMonth(@RequestParam(required = false) - @Parameter(description = "yyyy-MM-dd",example = "2002-10-11")LocalDate Month + @Parameter(description = "yyyy-MM-dd",example = "2002-10-11")LocalDate LossMonth /*,@RequestParam(required = false) LocalDate endMonth*/) { /* @@ -55,8 +74,8 @@ public class DicekeMininglossController { return Result.successResult().data("LossMonthRangeList", LossByMonthRangeVoList); } else */ - if (Month != null){ //Month存在 通过获取year年和month月查询此月报表 - List LossByMonthVoList = dicekeMininglossService.getLossByMonth(Month); + if (LossMonth != null){ //Month存在 通过获取year年和month月查询此月报表 + List LossByMonthVoList = dicekeMininglossService.getLossByMonth(LossMonth); System.out.println(LossByMonthVoList.toString()); return Result.successResult().data("LossMonthVoList", LossByMonthVoList); } else { @@ -95,18 +114,17 @@ public class DicekeMininglossController { @Operation(summary = "新增损失和贫化信息") @PostMapping("savedicekeMiningloss") - public Result saveLoss(@RequestBody DicekeMininglossVo dicekeMininglossVo){ + public Result saveLoss(@RequestBody DicekeMiningloss dicekeMiningloss){ - 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(); - } + boolean updateflag = dicekeMininglossService.save(dicekeMiningloss); + if (updateflag){ + return Result.successResult(); + } else { + return Result.errorResult(); + } } + + } diff --git a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java index 199f41d..10ac954 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java +++ b/src/main/java/com/jdc/jdcproject/mapper/DicekeMininglossMapper.java @@ -1,5 +1,6 @@ package com.jdc.jdcproject.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jdc.jdcproject.entity.DicekeMiningloss; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jdc.jdcproject.entity.VO.DicekeMininglossVo; @@ -31,5 +32,5 @@ public interface DicekeMininglossMapper extends BaseMapper { List findLossByMonth(int monthV,int year); - + Page selectLossPage(Page page); } 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 0d46db8..99a392a 100644 --- a/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml +++ b/src/main/java/com/jdc/jdcproject/mapper/xml/DicekeMininglossMapper.xml @@ -62,4 +62,23 @@ LEFT JOIN diceke_shovel ds ON dml.ShovelID = ds.ShovelID WHERE YEAR(dml.Month) = #{year} AND MONTH(dml.Month) = #{monthV} + + diff --git a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java index 302bd48..6c87d85 100644 --- a/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java +++ b/src/main/java/com/jdc/jdcproject/service/IDicekeMininglossService.java @@ -1,9 +1,9 @@ package com.jdc.jdcproject.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; import java.time.LocalDate; import java.util.List; @@ -20,7 +20,11 @@ public interface IDicekeMininglossService extends IService { List findAllLoss(); + Page getPage(int pageNum); + + /* int savedml(DicekeMininglossVo dicekeMininglossVo); + */ /* // 两个时间内查询 @@ -28,5 +32,7 @@ public interface IDicekeMininglossService extends IService { */ - List getLossByMonth(LocalDate Month); + List getLossByMonth(LocalDate currentDate); + + } 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 6cd5949..994cbe3 100644 --- a/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java +++ b/src/main/java/com/jdc/jdcproject/service/impl/DicekeMininglossServiceImpl.java @@ -1,6 +1,7 @@ package com.jdc.jdcproject.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jdc.jdcproject.entity.DicekeMiningloss; import com.jdc.jdcproject.entity.DicekePlatearea; import com.jdc.jdcproject.entity.DicekeShovel; @@ -10,10 +11,6 @@ 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.apache.commons.lang.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -77,19 +74,37 @@ public class DicekeMininglossServiceImpl extends ServiceImpl getLossByMonth(LocalDate month) { - int year = month.getYear(); - int monthV = month.getMonthValue(); - return baseMapper.findLossByMonth(monthV,year); + public List getLossByMonth(LocalDate currentDate) { + + int year = currentDate.getYear(); + int monthV = currentDate.getMonthValue(); + List lossMonthList = baseMapper.findLossByMonth(monthV, year); + if (lossMonthList.isEmpty()) { + LocalDate lastMonth; + if (currentDate.getMonthValue() == 1) { + lastMonth = LocalDate.of(currentDate.getYear() - 1, 12, 1); + } else { + lastMonth = LocalDate.of(currentDate.getYear(), currentDate.getMonthValue() - 1, 1); + } + return baseMapper.findLossByMonth(lastMonth.getMonthValue(),lastMonth.getYear()); + } + return lossMonthList; } + @Override + public Page getPage(int pageNum) { + Page page = new Page<>(pageNum, 30); + return baseMapper.selectLossPage(page); + } + +/* @Override public int savedml(DicekeMininglossVo dicekeMininglossVo) { - /* + *//* QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("plateRange",dicekeMininglossVo.getPlateRange()); DicekePlatearea dp = dicekePlateareaService.getOne(queryWrapper); - */ + *//* //平盘和电铲查找是否单独一个工具类（如果使用次数多） DicekePlatearea dp = dicekePlateareaMapper.selectOne( @@ -125,6 +140,7 @@ public class DicekeMininglossServiceImpl extends ServiceImpl