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 d9cddb5..2896176 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -6,6 +6,7 @@ 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; @@ -16,11 +17,20 @@ 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.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 描述: 供水量表 @@ -35,6 +45,9 @@ public class StWaterRController { @Autowired private StWaterRService service; + @Autowired + private ResMonthEcoFlowService resMonthEcoFlowService; + @Operation(summary = "新增") @PostMapping("/insert") @@ -104,4 +117,10 @@ 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/mapper/StWaterRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StWaterRMapper.java index 9b281ca..baa557e 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StWaterRMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StWaterRMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.project.xyt.model.StWaterR; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -19,12 +20,12 @@ public interface StWaterRMapper extends BaseMapper { @Select(""" """) - List stat(DateTimeRangeSo dateTimeRangeSo); + List stat(@Param("obj") DateTimeRangeSo dateTimeRangeSo); } \ No newline at end of file