diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java index d2589c3..d9cddb5 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -1,31 +1,26 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.project.xyt.entity.vo.StWaterRVo; +import com.gunshi.project.xyt.model.ResMonthEcoFlow; import com.gunshi.project.xyt.model.StWaterR; +import com.gunshi.project.xyt.service.ResMonthEcoFlowService; import com.gunshi.project.xyt.service.StWaterRService; import com.gunshi.project.xyt.util.ConvertUtil; import com.gunshi.project.xyt.util.DateUtil; import com.gunshi.project.xyt.util.ExcelUtil; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; /** * 描述: 供水量表 @@ -74,6 +69,20 @@ public class StWaterRController { return R.ok(service.list(wrapper)); } + @Operation(summary = "获取月核定流量") + @GetMapping("/getResMonthEcoFlow") + public R> getResMonthEcoFlow(@Schema(name = "startTime", description = "开始时间") @RequestParam("startTime") String startTime, @Schema(name = "endTime", description = "开始时间") @RequestParam("endTime") String endTime) { + Map resMap = new HashMap<>(); + QueryWrapper wrapper = new QueryWrapper() + .ge(StringUtils.isNotEmpty(startTime), "month", Integer.valueOf(startTime.substring(5, 7))) + .le(StringUtils.isNotEmpty(endTime), "month", Integer.valueOf(endTime.substring(5, 7))); + List list = resMonthEcoFlowService.list(wrapper); + if(CollectionUtils.isNotEmpty(list)){ + resMap = list.stream().collect(Collectors.toMap(ResMonthEcoFlow::getMonth, ResMonthEcoFlow::getValue)); + } + return R.ok(resMap); + } + @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated StWaterR stWaterR) { @@ -95,10 +104,4 @@ public class StWaterRController { List vos = ConvertUtil.entityToVoList(this.list(stWaterR).getData(), StWaterRVo.class); ExcelUtil.exportExcel(vos, filename, StWaterRVo.class, response, "供水流量表"); } - - @Operation(summary = "闸阀总览-供水统计") - @PostMapping("/stat") - public R> stat(@RequestBody @Validated DateTimeRangeSo dateTimeRangeSo) { - return R.ok(service.stat(dateTimeRangeSo)); - } } diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRRealController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRRealController.java index b2967d5..6aa0d6f 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRRealController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRRealController.java @@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.gunshi.core.result.R; import com.gunshi.project.xyt.model.ResMonthEcoFlow; import com.gunshi.project.xyt.model.StWaterRReal; import com.gunshi.project.xyt.service.ResMonthEcoFlowService; +import com.gunshi.project.xyt.service.StStbprpBService; import com.gunshi.project.xyt.service.StWaterRRealService; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; @@ -37,6 +39,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; @RequestMapping(value="/stWaterRReal") public class StWaterRRealController { + @Autowired + private StStbprpBService stStbprpBService; + @Autowired private StWaterRRealService service; @@ -81,7 +86,17 @@ public class StWaterRRealController { @Operation(summary = "列表") @PostMapping("/list") public R> list() { - return R.ok(service.lambdaQuery().list()); + List list = service.listRelated(); + if(CollectionUtils.isNotEmpty(list)){ + // 获取当月核定流量 + ResMonthEcoFlow resMonthEcoFlow = resMonthEcoFlowService.getOne(new QueryWrapper().eq("month", Calendar.getInstance().get(Calendar.MONTH) + 1)); + if(ObjectUtils.isNotEmpty(resMonthEcoFlow)){ + for(StWaterRReal real : list){ + real.setResMonthEcoFlow(resMonthEcoFlow); + } + } + } + return R.ok(list); } // @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StWaterRRealMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StWaterRRealMapper.java index 2206fff..dc2ddab 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StWaterRRealMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StWaterRRealMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gunshi.project.xyt.model.StWaterRReal; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 描述: 供水量实时表 * author: xusan @@ -12,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface StWaterRRealMapper extends BaseMapper { -} \ No newline at end of file + List listRelated(); +} diff --git a/src/main/java/com/gunshi/project/xyt/service/StWaterRRealService.java b/src/main/java/com/gunshi/project/xyt/service/StWaterRRealService.java index 84f1aaf..96c63a5 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StWaterRRealService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StWaterRRealService.java @@ -1,13 +1,15 @@ package com.gunshi.project.xyt.service; +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.xyt.mapper.StWaterRRealMapper; import com.gunshi.project.xyt.model.StWaterRReal; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; +import lombok.extern.slf4j.Slf4j; /** * 描述: 供水量实时表 @@ -20,6 +22,9 @@ import java.util.Date; public class StWaterRRealService extends ServiceImpl { + public List listRelated() { + return baseMapper.listRelated(); + } } diff --git a/src/main/resources/mapper/StWaterRRealMapper.xml b/src/main/resources/mapper/StWaterRRealMapper.xml index 0e6a3e7..9562afd 100644 --- a/src/main/resources/mapper/StWaterRRealMapper.xml +++ b/src/main/resources/mapper/StWaterRRealMapper.xml @@ -2,4 +2,12 @@ +