From 05d043ad540dafa9687e8c825740079f08a85575 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 26 Jan 2024 19:00:45 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...chargingPlatformCurrentDataController.java | 2 +- .../DischargingPlatformDevController.java | 12 ++++++++++- .../vo/CountDischargingPlatformDevVo.java | 12 +++++++++++ .../DischargingPlatformAlarmMapper.java | 2 ++ .../xml/DischargingPlatformAlarmMapper.xml | 8 +++++++ .../DischargingPlatformCurrentDataMapper.xml | 3 ++- .../IDischargingPlatformDevService.java | 4 ++++ .../DischargingPlatformDevServiceImpl.java | 21 +++++++++++++++++-- 8 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformDevVo.java 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 dfc9fb4b2..b12025a3e 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 @@ -138,7 +138,7 @@ public class DischargingPlatformCurrentDataController { return Result.success(dischargingPlatformCurrentDataService.countLoadRatioTrend(paramMap)); } - @ApiOperation(value = "统计卸料平台", notes = "统计卸料平台", httpMethod = "POST") + @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"), diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformDevController.java b/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformDevController.java index 4b75247d8..418c9b66c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformDevController.java @@ -5,6 +5,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; +import com.zhgd.xmgl.modules.discharging.entity.vo.CountDischargingPlatformDevVo; import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformDevService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.*; @@ -12,8 +13,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -137,5 +140,12 @@ public class DischargingPlatformDevController { return result; } - + @ApiOperation(value = "统计卸料平台", notes = "统计卸料平台", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countDischargingPlatformDev") + public Result countDischargingPlatformDev(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(dischargingPlatformDevService.countDischargingPlatformDev(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformDevVo.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformDevVo.java new file mode 100644 index 000000000..b2aa07450 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/vo/CountDischargingPlatformDevVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.discharging.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountDischargingPlatformDevVo { + @ApiModelProperty(value = "正常设备数量") + private Integer normalNum; + @ApiModelProperty(value = "告警设备数量") + private 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 e14149bcd..c99b8b5ef 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 @@ -41,4 +41,6 @@ public interface DischargingPlatformAlarmMapper extends BaseMapper countAlarmType(HashMap paramMap); CountAlarmLevelVo countAlarmLevel(HashMap paramMap); + + Integer countAlarmNum(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 5082ac5c2..dfbb52f3c 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 @@ -116,6 +116,7 @@ and dev_sn = #{devSn} + and add_time >= current_date group by alarm_type order by count desc @@ -133,4 +134,11 @@ and dev_sn = #{devSn} + + 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 0a9e2d002..901f3e1d8 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,7 +4,8 @@