From c6ee7551323e44d12f075e76088870b2f6f903c2 Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 25 Jan 2024 11:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B8=E6=96=99=E5=B9=B3=E5=8F=B0=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/base/entity/vo/TrendVo.java | 2 + .../DischargingPlatformAlarmController.java | 24 ++++ ...chargingPlatformCurrentDataController.java | 41 ++++++- .../DischargingPlatformCurrentData.java | 18 ++- .../entity/vo/CountAlarmLevelVo.java | 14 +++ ...CountDischargingPlatformCurrentDataVo.java | 12 ++ .../DischargingPlatformAlarmMapper.java | 10 ++ .../DischargingPlatformCurrentDataMapper.java | 12 +- .../xml/DischargingPlatformAlarmMapper.xml | 40 +++++++ .../DischargingPlatformCurrentDataMapper.xml | 103 +++++++++++++++++- .../IDischargingPlatformAlarmService.java | 6 + ...DischargingPlatformCurrentDataService.java | 10 ++ .../DischargingPlatformAlarmServiceImpl.java | 13 +++ ...hargingPlatformCurrentDataServiceImpl.java | 51 ++++++++- .../HangBasketAlarmDataController.java | 1 + 15 files changed, 337 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountAlarmLevelVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformCurrentDataVo.java diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java index 02b733656..26c499d41 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.base.entity.vo; import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,6 +19,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class TrendVo { @JsonInclude(JsonInclude.Include.NON_NULL) + @ApiModelProperty("其中一条折线或圆柱的名称") private String name; private List oneTrendList; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformAlarmController.java index 5a667136c..6f7e65c2e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformAlarmController.java @@ -3,6 +3,9 @@ package com.zhgd.xmgl.modules.discharging.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo; import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformAlarmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -11,6 +14,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.util.HashMap; import java.util.List; @@ -88,4 +92,24 @@ public class DischargingPlatformAlarmController { } + @ApiOperation(value = "统计报警类型", notes = "统计报警类型", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countAlarmType") + public Result countAlarmType(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(dischargingPlatformAlarmService.countAlarmType(paramMap)); + } + + @ApiOperation(value = "统计报警等级（实时告警）", notes = "统计报警等级（实时告警）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countAlarmLevel") + public Result countAlarmLevel(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(dischargingPlatformAlarmService.countAlarmLevel(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformCurrentDataController.java index 0603401be..dfc9fb4b2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformCurrentDataController.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo; import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformCurrentDataService; -import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -112,18 +114,49 @@ public class DischargingPlatformCurrentDataController { @ApiOperation(value = "查询卸料平台最新一条实时数据", notes = "查询卸料平台最新一条实时数据", httpMethod = "POST") - @ApiImplicitParam(name = "devSn", value = "设备编号", paramType = "body", required = true, dataType = "Integer") + @ApiImplicitParam(name = "devSn", value = "设备编号", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/getNewestDischargingPlatformCurrentData") public Result getNewestDischargingPlatformCurrentData(@RequestBody Map map) { return Result.success(dischargingPlatformCurrentDataService.getNewestDischargingPlatformCurrentData(map)); } - @ApiOperation(value = "查询卸料平台当日实时数据", notes = "查询卸料平台当日实时数据", httpMethod = "POST") - @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = true, dataType = "Integer") + @ApiOperation(value = "查询卸料平台当日实时数据列表", notes = "查询卸料平台当日实时数据列表", httpMethod = "POST") + @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/getTodayDischargingPlatformCurrentDataList") public Result> getTodayDischargingPlatformCurrentDataList(@RequestBody Map map) { return Result.success(dischargingPlatformCurrentDataService.getTodayDischargingPlatformCurrentDataList(map)); } + @ApiOperation(value = "统计载重比趋势（载重比分析）", notes = "统计载重比趋势（载重比分析）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "date", value = "日期", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countLoadRatioTrend") + public Result> countLoadRatioTrend(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(dischargingPlatformCurrentDataService.countLoadRatioTrend(paramMap)); + } + + @ApiOperation(value = "统计卸料平台", notes = "统计卸料平台", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countDischargingPlatformCurrentData") + public Result countDischargingPlatformCurrentData(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(dischargingPlatformCurrentDataService.countDischargingPlatformCurrentData(paramMap)); + } + + @ApiOperation(value = "统计最大、小载重趋势（历史载重）", notes = "统计最大、小载重趋势（历史载重）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1、7日2、30日3、近1年", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countLoad") + public Result> countLoad(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(dischargingPlatformCurrentDataService.countLoad(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java index 471b83000..6806e1699 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java @@ -23,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="DischargingPlatformCurrentData实体类",description="DischargingPlatformCurrentData") public class DischargingPlatformCurrentData implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -59,14 +59,20 @@ public class DischargingPlatformCurrentData implements Serializable { @TableField(exist = false) - @ApiModelProperty(value="是否有报警，0否，1是") + @ApiModelProperty(value = "是否有报警，0否，1是") private java.lang.Integer isAlarm; @TableField(exist = false) - @ApiModelProperty(value="报警类型") - private java.lang.String alarmType ; + @ApiModelProperty(value = "报警类型") + private java.lang.String alarmType; @TableField(exist = false) - @ApiModelProperty(value="报警等级，1 紧急告警，2 重要告警，3 次要告警，4 提示告警") - private java.lang.Integer alarmLevel ; + @ApiModelProperty(value = "报警等级，1 紧急告警，2 重要告警，3 次要告警，4 提示告警") + private java.lang.Integer alarmLevel; + + @TableField(exist = false) + @ApiModelProperty(value = "载重比%") + private java.lang.Double loadRatio; + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountAlarmLevelVo.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountAlarmLevelVo.java new file mode 100644 index 000000000..b75953843 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountAlarmLevelVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.discharging.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountAlarmLevelVo { + @ApiModelProperty(value = "严重数量") + private java.lang.Integer seriousNum; + @ApiModelProperty(value = "较重数量") + private java.lang.Integer heavierNum; + @ApiModelProperty(value = "一般数量") + private java.lang.Integer generallyNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformCurrentDataVo.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformCurrentDataVo.java new file mode 100644 index 000000000..68271a72e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformCurrentDataVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.discharging.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountDischargingPlatformCurrentDataVo { + @ApiModelProperty(value = "正常数量") + private java.lang.Integer normalNum; + @ApiModelProperty(value = "告警数量") + private java.lang.Integer alarmNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java index cab890cd1..dc39186d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformAlarmMapper.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -30,4 +34,10 @@ public interface DischargingPlatformAlarmMapper extends BaseMapper getAlarmCycleTrendGraph(Map map); List queryAlarmTypeRadarChart(Map map); + + CountDischargingPlatformCurrentDataVo countDischargingPlatformAlarm(HashMap paramMap); + + List countAlarmType(HashMap paramMap); + + CountAlarmLevelVo countAlarmLevel(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformCurrentDataMapper.java index dddf4bdb4..7cc6e48b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformCurrentDataMapper.java @@ -1,10 +1,14 @@ package com.zhgd.xmgl.modules.discharging.mapper; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -23,5 +27,11 @@ public interface DischargingPlatformCurrentDataMapper extends BaseMapper getTodayDischargingPlatformCurrentDataList(Map map); - List queryDischargingPlatformCurrentDataPageList(Page page, @Param("param")Map map); + List queryDischargingPlatformCurrentDataPageList(Page page, @Param("param") Map map); + + ArrayList countLoadRatioTrend(HashMap paramMap); + + CountDischargingPlatformCurrentDataVo countDischargingPlatformCurrentData(HashMap paramMap); + + List countLoad(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml index a7e4a21c5..839a38f70 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml @@ -90,4 +90,44 @@ and dpa.add_time >= DATE_SUB(NOW(),INTERVAL 30 day) GROUP BY dpa.alarm_type + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformCurrentDataMapper.xml index 223613500..0a9e2d002 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformCurrentDataMapper.xml @@ -4,10 +4,11 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformAlarmService.java index d90060e03..26766cf83 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformAlarmService.java @@ -2,9 +2,11 @@ package com.zhgd.xmgl.modules.discharging.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo; import java.util.HashMap; import java.util.List; @@ -25,4 +27,8 @@ public interface IDischargingPlatformAlarmService extends IService getAlarmCycleTrendGraph(Map map); List queryAlarmTypeRadarChart(Map map); + + SectorVo countAlarmType(HashMap paramMap); + + CountAlarmLevelVo countAlarmLevel(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformCurrentDataService.java index b0809771d..c8243edcc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformCurrentDataService.java @@ -2,9 +2,13 @@ package com.zhgd.xmgl.modules.discharging.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,4 +27,10 @@ public interface IDischargingPlatformCurrentDataService extends IService getTodayDischargingPlatformCurrentDataList(Map map); IPage queryDischargingPlatformCurrentDataPageList(Map map); + + List countLoadRatioTrend(HashMap paramMap); + + CountDischargingPlatformCurrentDataVo countDischargingPlatformCurrentData(HashMap paramMap); + + List countLoad(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java index a73c31af0..ca4755225 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformAlarmServiceImpl.java @@ -5,10 +5,13 @@ 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.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.basicdata.entity.Notice; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountAlarmLevelVo; import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformAlarmMapper; import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformAlarmService; import org.apache.commons.collections.MapUtils; @@ -153,6 +156,16 @@ public class DischargingPlatformAlarmServiceImpl extends ServiceImpl paramMap) { + return SectorVo.getSectorVo(baseMapper.countAlarmType(paramMap)); + } + + @Override + public CountAlarmLevelVo countAlarmLevel(HashMap paramMap) { + return baseMapper.countAlarmLevel(paramMap); + } + /** * 补全数据 * diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformCurrentDataServiceImpl.java index 79f416679..e9bf26102 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformCurrentDataServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.basicdata.entity.Notice; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.NoticeMapper; @@ -15,6 +17,8 @@ import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformAlarm; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformCurrentDataVo; +import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformAlarmMapper; import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformCurrentDataMapper; import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformDevMapper; import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformAlarmService; @@ -22,15 +26,13 @@ import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformCurrentData import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * @Description: 卸料平台-实时数据 @@ -51,6 +53,8 @@ public class DischargingPlatformCurrentDataServiceImpl extends ServiceImpl list = dischargingPlatformCurrentDataMapper.queryDischargingPlatformCurrentDataPageList(page, map); return page.setRecords(list); } + + @Override + public List countLoadRatioTrend(HashMap paramMap) { + ArrayList list = baseMapper.countLoadRatioTrend(paramMap); + return TrendOneVo.fillTrendVos(list, DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"), "HH:00"); + } + + @Override + public CountDischargingPlatformCurrentDataVo countDischargingPlatformCurrentData(HashMap paramMap) { + CountDischargingPlatformCurrentDataVo vo = baseMapper.countDischargingPlatformCurrentData(paramMap); + CountDischargingPlatformCurrentDataVo vo1 = dischargingPlatformAlarmMapper.countDischargingPlatformAlarm(paramMap); + vo.setAlarmNum(vo1.getAlarmNum()); + return vo; + } + + @Override + public List countLoad(HashMap paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); + String format = null; + List dateTimeStrList = null; + if (Objects.equals(type, 1)) { + format = "yyyy-MM-dd"; + dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); + } else if (Objects.equals(type, 2)) { + format = "yyyy-MM-dd"; + dateTimeStrList = DateUtils.getDateTimeStrList(80, "yyyy-MM-dd"); + } else if (Objects.equals(type, 3)) { + format = "yyyy-MM"; + dateTimeStrList = DateUtils.getDateTimeStrList(93, "yyyy-MM"); + } else { + return null; + } + List list = baseMapper.countLoad(paramMap); + List l = new ArrayList<>(); + l.add(new TrendVo("最高值", "1")); + l.add(new TrendVo("最低值", "2")); + return TrendVo.getTrendVos(l, list, dateTimeStrList, format); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java index 18f9447a4..594f0acfa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketAlarmDataController.java @@ -107,6 +107,7 @@ public class HangBasketAlarmDataController { UserInfo userInfo = SecurityUtils.getUser(); hangBasketAlarmData.setOperateId(userInfo.getUserId()); hangBasketAlarmData.setOperateTime(new Date()); + hangBasketAlarmData.setOperateName(userInfo.getRealName()); } hangBasketAlarmDataService.updateById(hangBasketAlarmData); return Result.ok();