diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java index 5cabc96b5..3f1170949 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationDataController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -141,4 +142,13 @@ public class ConcreteMixStationDataController { public Result> countConcreteMixStationDataTrend(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(concreteMixStationDataService.countConcreteMixStationDataTrend(paramMap)); } + + @ApiOperation(value = "统计混凝土拌合站生产数据(实时监测)", notes = "统计混凝土拌合站生产数据(实时监测)", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countConcreteMixStationData") + public Result countConcreteMixStationData(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(concreteMixStationDataService.countConcreteMixStationData(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/vo/CountConcreteMixStationDataVo.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/vo/CountConcreteMixStationDataVo.java new file mode 100644 index 000000000..147456fb3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/entity/vo/CountConcreteMixStationDataVo.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.concretemixstation.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountConcreteMixStationDataVo { + @ApiModelProperty(value = "日产量") + private java.lang.Double dailyOutput; + @ApiModelProperty(value = "总产量") + private java.lang.Double totalOutput; + @ApiModelProperty(value = "日盘数") + private java.lang.Double dayNumber; + @ApiModelProperty(value = "总盘数") + private java.lang.Double totalNumber; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java index c61537273..9fda58007 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationDataMapper.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.concretemixstation.mapper; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -18,4 +19,6 @@ import java.util.List; public interface ConcreteMixStationDataMapper extends BaseMapper { List countConcreteMixStationDataTrend(HashMap paramMap); + + CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml index b5803e89f..3d2ef6718 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationDataMapper.xml @@ -29,4 +29,14 @@ group by dev_sn, date_format(discharge_time, '%Y-%m-%d') + + diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java index 5e3a73595..14b940e6c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java @@ -4,6 +4,7 @@ import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import java.util.HashMap; import java.util.List; @@ -25,4 +26,6 @@ public interface IConcreteMixStationDataService extends IService countConcreteMixStationDataTrend(HashMap paramMap); + + CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java index 4157b90b1..b9cc13bd6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationDataServiceImpl.java @@ -10,6 +10,7 @@ import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDataMapper; import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationDevMapper; import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationDataService; @@ -100,4 +101,9 @@ public class ConcreteMixStationDataServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countConcreteMixStationData(paramMap); + } }