diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index 2007b6893..a12294a0e 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java @@ -1,6 +1,8 @@ package com.zhgd.xmgl.enums; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.experimental.UtilityClass; import java.util.Arrays; @@ -537,5 +539,42 @@ public class ParamEnum { } } + /** + * 使用状态:1正常2初级超标3中级超标4高级超标5异常 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ConcreteMixStationDataUseStatusEnum implements BaseEnum { + NORMAL(1, "正常"), + PRIMARY_LEVEL_EXCEEDS_STANDARD(2, "初级超标"), + INTERMEDIATE_LEVEL_EXCEEDS_STANDARD(3, "中级超标"), + ADVANCED_EXCEEDING_STANDARD(4, "高级超标"), + ABNORMAL(5, "异常"), + ; + + ConcreteMixStationDataUseStatusEnum(Integer value, String desc) { + this.value = value; + this.desc = desc; + } + + private Integer value; + private String desc; + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + } + } 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 3f1170949..b0a5215a1 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 @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.concretemixstation.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.SectorVo; 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; @@ -146,9 +147,31 @@ public class ConcreteMixStationDataController { @ApiOperation(value = "统计混凝土拌合站生产数据(实时监测)", notes = "统计混凝土拌合站生产数据(实时监测)", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/countConcreteMixStationData") public Result countConcreteMixStationData(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(concreteMixStationDataService.countConcreteMixStationData(paramMap)); } + + @ApiOperation(value = "生产质量统计", notes = "生产质量统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countUseStatus") + public Result countUseStatus(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(concreteMixStationDataService.countUseStatus(paramMap)); + } + + @ApiOperation(value = "各配比产量", notes = "各配比产量", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countPowerLevel") + public Result countPowerLevel(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(concreteMixStationDataService.countPowerLevel(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java index 66e3e347c..e26fe8619 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/controller/ConcreteMixStationMaterialDataController.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.concretemixstation.controller; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationMaterialDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -136,4 +139,14 @@ public class ConcreteMixStationMaterialDataController { return result; } + @ApiOperation(value = "原材用量统计", notes = "原材用量统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countMaterialName") + public Result countMaterialName(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(concreteMixStationMaterialDataService.countMaterialName(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 index 147456fb3..ee22ecaf9 100644 --- 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 @@ -10,8 +10,8 @@ public class CountConcreteMixStationDataVo { @ApiModelProperty(value = "总产量") private java.lang.Double totalOutput; @ApiModelProperty(value = "日盘数") - private java.lang.Double dayNumber; + private java.lang.Integer dayNumber; @ApiModelProperty(value = "总盘数") - private java.lang.Double totalNumber; + private java.lang.Integer 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 9fda58007..5ef0aa358 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 @@ -1,11 +1,13 @@ package com.zhgd.xmgl.modules.concretemixstation.mapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; 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; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,4 +23,8 @@ public interface ConcreteMixStationDataMapper extends BaseMapper countConcreteMixStationDataTrend(HashMap paramMap); CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap); + + ArrayList countUseStatus(HashMap paramMap); + + ArrayList countPowerLevel(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java index d5818ebcd..721a80339 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/ConcreteMixStationMaterialDataMapper.java @@ -1,9 +1,13 @@ package com.zhgd.xmgl.modules.concretemixstation.mapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; +import java.util.List; + /** * @Description: 混凝土拌合站材料用量数据 * @author: pds @@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface ConcreteMixStationMaterialDataMapper extends BaseMapper { + List countMaterialName(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 3d2ef6718..40dcd3b79 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 @@ -32,11 +32,52 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml index 600a3127c..bf3878cbb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/mapper/xml/ConcreteMixStationMaterialDataMapper.xml @@ -1,4 +1,26 @@ + 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 14b940e6c..23ba1142a 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 @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.concretemixstation.service; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationData; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,4 +29,8 @@ public interface IConcreteMixStationDataService extends IService countConcreteMixStationDataTrend(HashMap paramMap); CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap); + + SectorVo countUseStatus(HashMap paramMap); + + SectorVo countPowerLevel(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java index 5226fa65a..715a522a4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.concretemixstation.service; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,4 +23,6 @@ public interface IConcreteMixStationMaterialDataService extends IService 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 b9cc13bd6..8bace5036 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 @@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.enums.ParamEnum; 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; @@ -22,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -106,4 +110,16 @@ public class ConcreteMixStationDataServiceImpl extends ServiceImpl paramMap) { return baseMapper.countConcreteMixStationData(paramMap); } + + @Override + public SectorVo countUseStatus(HashMap paramMap) { + ArrayList list = baseMapper.countUseStatus(paramMap); + return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values()); + } + + @Override + public SectorVo countPowerLevel(HashMap paramMap) { + ArrayList list = baseMapper.countPowerLevel(paramMap); + return SectorVo.getSectorVo(list); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java index b663dc4ea..ed9351cfc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/impl/ConcreteMixStationMaterialDataServiceImpl.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.concretemixstation.service.impl; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationMaterialData; import com.zhgd.xmgl.modules.concretemixstation.mapper.ConcreteMixStationMaterialDataMapper; import com.zhgd.xmgl.modules.concretemixstation.service.IConcreteMixStationMaterialDataService; @@ -66,4 +68,10 @@ public class ConcreteMixStationMaterialDataServiceImpl extends ServiceImpl paramMap) { + List list = baseMapper.countMaterialName(paramMap); + return SectorVo.getSectorVo(list); + } }