新部署一套

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbDustTargetinfoController.java

@@ -53,7 +53,7 @@ public class TbDustTargetinfoController extends BaseController<TbDustTargetinfo,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             HttpServletRequest req) {
-        QueryWrapper<TbDustTargetinfo> queryWrapper = QueryGenerator.initQueryWrapper(new TbDustTargetinfo(), req.getParameterMap());
+        QueryWrapper<TbDustTargetinfo> queryWrapper = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(key)) {
 
         }

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbDustWarningController.java

@@ -4,6 +4,7 @@ import cc.admin.common.api.vo.Result;
 import cc.admin.common.aspect.annotation.AutoLog;
 import cc.admin.common.sys.base.controller.BaseController;
 import cc.admin.common.sys.query.QueryGenerator;
+import cc.admin.common.util.oConvertUtils;
 import cc.admin.modules.dust.entity.TbDustWarning;
 import cc.admin.modules.dust.service.ITbDustWarningService;
 import cn.hutool.core.util.IdUtil;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,13 +51,37 @@ public class TbDustWarningController extends BaseController<TbDustWarning, ITbDu
     @ApiOperation(value = "预警信息推送记录表-分页列表查询", notes = "预警信息推送记录表-分页列表查询")
     @GetMapping(value = "/list")
     public Result<?> queryPageList(
-            @RequestParam(name = "key", required = false) String key,
+            @RequestParam(name = "targetCode", required = false) String targetCode,
+            @RequestParam(name = "targetName", required = false) String targetName,
+            @RequestParam(name = "targetType", required = false) String targetType,
+            @RequestParam(name = "rank", required = false) String rank,
+            @RequestParam(name = "warnStatus", required = false) String warnStatus,
+            @RequestParam(name = "startTime", required = false)String startTime,
+            @RequestParam(name = "endTime", required = false)String endTime,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
             HttpServletRequest req) {
-        QueryWrapper<TbDustWarning> queryWrapper = QueryGenerator.initQueryWrapper(new TbDustWarning(), req.getParameterMap());
-        if (StrUtil.isNotEmpty(key)) {
-
+        QueryWrapper<TbDustWarning> queryWrapper = new QueryWrapper<>();
+         if (StrUtil.isNotEmpty(targetCode)){
+             queryWrapper.eq("target_code", targetCode);
+         }
+         if (StrUtil.isNotEmpty(targetName)){
+             queryWrapper.eq("target_name", targetName);
+         }
+         if (StrUtil.isNotEmpty(targetType)){
+             queryWrapper.eq("target_type", targetType);
+         }
+         if (StrUtil.isNotEmpty(rank)){
+             queryWrapper.eq("rank", rank);
+         }
+         if (StrUtil.isNotEmpty(warnStatus)){
+             queryWrapper.eq("warn_status", warnStatus);
+         }
+         if (StrUtil.isNotEmpty(startTime)){
+             queryWrapper.ge("start_time", startTime);
+         }
+         if (StrUtil.isNotEmpty(endTime)){
+             queryWrapper.le("end_time", endTime);
          }
 
         Page<TbDustWarning> page = new Page<TbDustWarning>(pageNo, pageSize);

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbHomeController.java

@@ -0,0 +1,110 @@
+package cc.admin.modules.dust.controller;
+
+import cc.admin.common.api.vo.Result;
+import cc.admin.common.aspect.annotation.AutoLog;
+import cc.admin.common.util.RedisUtil;
+import cc.admin.modules.dust.entity.TbDustTargetinfo;
+import cc.admin.modules.dust.entity.TbDustWarning;
+import cc.admin.modules.dust.service.ITbDustTargetinfoService;
+import cc.admin.modules.dust.service.ITbDustWarningService;
+import cc.admin.modules.dust.utils.KeyUtils;
+import cc.admin.modules.dust.vo.DustMonitorVo;
+import cc.admin.modules.dust.vo.DustStatisticsVo;
+import cc.admin.modules.dust.vo.RedisDataVo;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.pqc.jcajce.provider.util.KeyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = "首页")
+@RestController
+@RequestMapping("/tb/home")
+public class TbHomeController {
+
+    @Autowired
+    private ITbDustWarningService tbDustWarningService;
+    @Autowired
+    private ITbDustTargetinfoService tbDustTargetinfoService;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    /**
+     *
+     */
+    @AutoLog(value = "首页统计")
+    @ApiOperation(value = "首页统计", notes = "首页统计")
+    @GetMapping(value = "/statistics")
+    public Result<?> statistics(  @RequestParam(name = "equipId", required = false) String equipId) {
+        DustStatisticsVo dustStatisticsVo = new DustStatisticsVo();
+
+        Integer count = tbDustWarningService.lambdaQuery()
+                .eq(TbDustWarning::getWarnStatus, "0")
+                .eq(TbDustWarning::getEquipinfoId, equipId)
+                .count();//未处置报警
+        dustStatisticsVo.setUnprocessedAlarmCount(count);
+
+        // 1. 获取今天的日期
+        LocalDate today = LocalDate.now();
+        LocalDateTime startOfToday = today.atStartOfDay();         // 00:00:00.000
+        LocalDateTime endOfToday = LocalDateTime.of(today, LocalTime.MAX); // 23:59:59.999999999
+        Integer todayAlarmCount = tbDustWarningService.lambdaQuery()
+                .eq(TbDustWarning::getEquipinfoId, equipId)
+                .between(TbDustWarning::getStartTime, startOfToday, endOfToday)
+                .count();// 今日报警
+        dustStatisticsVo.setTodayAlarmCount(todayAlarmCount);
+
+        int cumulativeAlarmCount = tbDustWarningService.lambdaQuery()
+                .eq(TbDustWarning::getEquipinfoId, equipId)
+                .count();
+        dustStatisticsVo.setCumulativeAlarmCount(cumulativeAlarmCount);//累计报警
+
+        Integer dryTypeMonitorPointCount = tbDustWarningService.lambdaQuery()
+                .eq(TbDustWarning::getEquipinfoId, equipId)
+                .eq(TbDustWarning::getWarnStatus, "1")
+                .count();
+        dustStatisticsVo.setAlarmProcessingRate(dryTypeMonitorPointCount * 1.0 / count); //报警处理率
+
+        return Result.ok(dustStatisticsVo);
+    }
+    @AutoLog(value = "首页系统监控")
+    @ApiOperation(value = "首页系统监控", notes = "首页系统监控")
+    @GetMapping(value = "/monitor")
+    public Result<?> monitor(@RequestParam(name = "equipId", required = false) String equipId) {
+
+        List<DustMonitorVo> monitorVoList = new ArrayList<>();
+
+        HashMap<String, List<DustMonitorVo>> hashMap = new HashMap<>();
+        List<TbDustTargetinfo> list = tbDustTargetinfoService.lambdaQuery()
+                .eq(TbDustTargetinfo::getEquipId, equipId)
+                .list();
+        Map<Object, Object> dustdata = redisUtil.hmget(KeyUtils.dustdataTag);
+        for (TbDustTargetinfo targetinfo : list) {
+            DustMonitorVo dustMonitorVo = new DustMonitorVo();
+            RedisDataVo redisDataVo = (RedisDataVo) dustdata.get(targetinfo.getTargetCode());
+            if (redisDataVo != null){
+                dustMonitorVo.setValue(redisDataVo.getValue());
+                dustMonitorVo.setAlarmLevel(redisDataVo.getAlarmLevel());
+                dustMonitorVo.setStatus(redisDataVo.getStatus());
+            }
+
+            BeanUtil.copyProperties(targetinfo, dustMonitorVo);
+        }
+        return Result.ok(monitorVoList);
+    }
+
+}

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustTargetinfo.java

@@ -57,6 +57,11 @@ public class TbDustTargetinfo {
     @Excel(name = "指标名称", width = 15)
     @ApiModelProperty(value = "指标名称")
     private String targetName;
+
+    @Excel(name = "是否是启停信号(0，否，1，是）", width = 15)
+    @ApiModelProperty(value = "是否是启停信号(0，否，1，是）")
+    private Integer type;
+
     /**
      * 指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号
      */
@@ -111,11 +116,27 @@ public class TbDustTargetinfo {
     @Excel(name = "量程下限，模拟量指标需要填写", width = 15)
     @ApiModelProperty(value = "量程下限，模拟量指标需要填写")
     private Double rangeDown;
+
+
+    /**
+     * 位号
+     */
+    @Excel(name = "位号", width = 15)
+    @ApiModelProperty(value = "位号")
+    private String alarmTime;
+
+    /**
+     * 位号
+     */
+    @Excel(name = "报警持续时间(视为报警)", width = 15)
+    @ApiModelProperty(value = "报警持续时间(视为报警)")
+    private String alarmDataRepeatedly;
+
     /**
      * 描述
      */
-    @Excel(name = "描述", width = 15)
-    @ApiModelProperty(value = "描述")
+    @Excel(name = "报警持续几次(视为正常)", width = 15)
+    @ApiModelProperty(value = "报警持续几次(视为正常)")
     private String targetDescription;
     /**
      * 位号

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustWarning.java

@@ -24,67 +24,117 @@ import cc.admin.common.aspect.annotation.Dict;
 @TableName("tb_dust_warning")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="tb_dust_warning对象", description="预警信息推送记录表")
+@ApiModel(value = "tb_dust_warning对象", description = "预警信息推送记录表")
 public class TbDustWarning {
 
-	/**预警编号，主键，唯一*/
+    /**
+     * 预警编号，主键，唯一
+     */
     @Excel(name = "预警编号，主键，唯一", width = 15)
     @ApiModelProperty(value = "预警编号，主键，唯一")
     private String id;
-	/**系统id*/
+    /**
+     * 指标编码，所属设备编码(13位)+3位流水编码
+     */
+    @Excel(name = "指标编码，所属设备编码(13位)+3位流水编码", width = 15)
+    @ApiModelProperty(value = "指标编码，所属设备编码(13位)+3位流水编码")
+    private String targetCode;
+    /**
+     * 指标名称
+     */
+    @Excel(name = "指标名称", width = 15)
+    @ApiModelProperty(value = "指标名称")
+    private String targetName;
+
+    /**
+     * 指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号
+     */
+    @Excel(name = "指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号", width = 15)
+    @ApiModelProperty(value = "指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号")
+    private String targetType;
+
+    /**
+     * 系统id
+     */
     @Excel(name = "系统id", width = 15)
     @ApiModelProperty(value = "系统id")
     private String equipinfoId;
-	/**预警发布单位*/
+    /**
+     * 预警发布单位
+     */
     @Excel(name = "预警发布单位", width = 15)
     @ApiModelProperty(value = "预警发布单位")
     private String warnUnit;
-	/**预警关联企业的数据接入标识*/
+    /**
+     * 预警关联企业的数据接入标识
+     */
     @Excel(name = "预警关联企业的数据接入标识", width = 15)
     @ApiModelProperty(value = "预警关联企业的数据接入标识")
     private String dataId;
-	/**预警等级：1-红色预警；2-橙色预警；3-黄色预警*/
+    /**
+     * 预警等级：1-红色预警；2-橙色预警；3-黄色预警
+     */
     @Excel(name = "预警等级：1-红色预警；2-橙色预警；3-黄色预警", width = 15)
     @ApiModelProperty(value = "预警等级：1-红色预警；2-橙色预警；3-黄色预警")
     private String rank;
-	/**预警起始时间*/
+    /**
+     * 预警起始时间
+     */
     @Excel(name = "预警起始时间", width = 15)
     @ApiModelProperty(value = "预警起始时间")
     private Date startTime;
-	/**预警状态：0-未消警；1-已消警*/
+    /**
+     * 预警状态：0-未消警；1-已消警
+     */
     @Excel(name = "预警状态：0-未消警；1-已消警", width = 15)
     @ApiModelProperty(value = "预警状态：0-未消警；1-已消警")
     private String warnStatus;
-	/**预警结束时间*/
+    /**
+     * 预警结束时间
+     */
     @Excel(name = "预警结束时间", width = 15)
     @ApiModelProperty(value = "预警结束时间")
     private Date endTime;
-	/**预警描述*/
+    /**
+     * 预警描述
+     */
     @Excel(name = "预警描述", width = 15)
     @ApiModelProperty(value = "预警描述")
     private String message;
-	/**有效标记*/
+    /**
+     * 有效标记
+     */
     @Excel(name = "有效标记", width = 15)
     @ApiModelProperty(value = "有效标记")
     private String actived;
-	/**删除标记：0-未删除；1-已删除*/
+    /**
+     * 删除标记：0-未删除；1-已删除
+     */
     @Excel(name = "删除标记：0-未删除；1-已删除", width = 15)
     @ApiModelProperty(value = "删除标记：0-未删除；1-已删除")
     @TableLogic
     private String delFlag;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
     private String creatorName;
-	/**创建时间*/
+    /**
+     * 创建时间
+     */
     @Excel(name = "创建时间", width = 15)
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-	/**修改人*/
+    /**
+     * 修改人
+     */
     @Excel(name = "修改人", width = 15)
     @ApiModelProperty(value = "修改人")
     private String updatorName;
-	/**修改时间*/
+    /**
+     * 修改时间
+     */
     @Excel(name = "修改时间", width = 15)
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustWarningFeedback.java

@@ -24,59 +24,104 @@ import cc.admin.common.aspect.annotation.Dict;
 @TableName("tb_dust_warning_feedback")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="tb_dust_warning_feedback对象", description="预警消息处置反馈表")
+@ApiModel(value = "tb_dust_warning_feedback对象", description = "预警消息处置反馈表")
 public class TbDustWarningFeedback {
 
-	/**预警编号，主键，唯一*/
+    /**
+     * 预警编号，主键，唯一
+     */
     @Excel(name = "预警编号，主键，唯一", width = 15)
     @ApiModelProperty(value = "预警编号，主键，唯一")
     private String id;
-	/**系统id*/
+    /**
+     * 系统id
+     */
     @Excel(name = "系统id", width = 15)
     @ApiModelProperty(value = "系统id")
     private String equipinfoId;
-	/**预警关联企业的数据接入标识*/
+    /**
+     * 预警关联企业的数据接入标识
+     */
     @Excel(name = "预警关联企业的数据接入标识", width = 15)
     @ApiModelProperty(value = "预警关联企业的数据接入标识")
     private String dataId;
-	/**预警等级：1-红色预警；2-橙色预警；3-黄色预警*/
+    /**
+     * 指标编码，所属设备编码(13位)+3位流水编码
+     */
+    @Excel(name = "指标编码，所属设备编码(13位)+3位流水编码", width = 15)
+    @ApiModelProperty(value = "指标编码，所属设备编码(13位)+3位流水编码")
+    private String targetCode;
+    /**
+     * 指标名称
+     */
+    @Excel(name = "指标名称", width = 15)
+    @ApiModelProperty(value = "指标名称")
+    private String targetName;
+
+    /**
+     * 指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号
+     */
+    @Excel(name = "指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号", width = 15)
+    @ApiModelProperty(value = "指标类别：01-除尘系统启停信号；02-除尘器进出风口压差；03-锁气卸灰故障信号；04-除尘器灰斗温度；05-爆炸防控措施失效信号；06-除尘器灭火装置有效性信号；07-泄爆装置失效信号；08-隔爆阀自锁反馈信号；09-过滤器清灰气源压力；10-喷淋水流量；11-水箱水位信号；12-金属粉储存场所氢气浓度信号；13-过滤水压力；15-火花熄灭装置喷淋水压/水蒸气压力；16-火花熄灭装置动作触发信号；17-火花探测系统运行信号；18-灰斗料位信号；19-输灰装置故障信号；20-火焰探测器报警信号；21-斗提机打滑、跑偏报警信号；22-火花熄灭装置喷淋管路流量信号")
+    private String targetType;
+    /**
+     * 预警等级：1-红色预警；2-橙色预警；3-黄色预警
+     */
     @Excel(name = "预警等级：1-红色预警；2-橙色预警；3-黄色预警", width = 15)
     @ApiModelProperty(value = "预警等级：1-红色预警；2-橙色预警；3-黄色预警")
     private String warningRank;
-	/**企业反馈信息*/
+    /**
+     * 企业反馈信息
+     */
     @Excel(name = "企业反馈信息", width = 15)
     @ApiModelProperty(value = "企业反馈信息")
     private String warnFeedback;
-	/**反馈时间*/
+    /**
+     * 反馈时间
+     */
     @Excel(name = "反馈时间", width = 15)
     @ApiModelProperty(value = "反馈时间")
     private Date realTime;
-	/**填报人*/
+    /**
+     * 填报人
+     */
     @Excel(name = "填报人", width = 15)
     @ApiModelProperty(value = "填报人")
     private String fillBy;
-	/**有效标记*/
+    /**
+     * 有效标记
+     */
     @Excel(name = "有效标记", width = 15)
     @ApiModelProperty(value = "有效标记")
     private String actived;
-	/**删除标记：0-未删除；1-已删除*/
+    /**
+     * 删除标记：0-未删除；1-已删除
+     */
     @Excel(name = "删除标记：0-未删除；1-已删除", width = 15)
     @ApiModelProperty(value = "删除标记：0-未删除；1-已删除")
     @TableLogic
     private String delFlag;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
     private String creatorName;
-	/**创建时间*/
+    /**
+     * 创建时间
+     */
     @Excel(name = "创建时间", width = 15)
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-	/**修改人*/
+    /**
+     * 修改人
+     */
     @Excel(name = "修改人", width = 15)
     @ApiModelProperty(value = "修改人")
     private String updatorName;
-	/**修改时间*/
+    /**
+     * 修改时间
+     */
     @Excel(name = "修改时间", width = 15)
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/service/impl/TbDustWarningFeedbackServiceImpl.java

@@ -1,8 +1,8 @@
-package cc.admin.modules.tb.service.impl;
+package cc.admin.modules.dust.service.impl;
 
-import cc.admin.modules.tb.entity.TbDustWarningFeedback;
-import cc.admin.modules.tb.mapper.TbDustWarningFeedbackMapper;
-import cc.admin.modules.tb.service.ITbDustWarningFeedbackService;
+import cc.admin.modules.dust.entity.TbDustWarningFeedback;
+import cc.admin.modules.dust.mapper.TbDustWarningFeedbackMapper;
+import cc.admin.modules.dust.service.ITbDustWarningFeedbackService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/DustMonitorVo.java

@@ -0,0 +1,26 @@
+package cc.admin.modules.dust.vo;
+
+import lombok.Data;
+
+@Data
+public class DustMonitorVo {
+
+    private  String equipId;
+
+    private  String equipCode;
+
+    private  String targetCode;
+
+    private  String targetName;
+
+    private  String targetType;
+
+    private  Integer type; //是否启停信号
+
+    private  Integer status; //设备状态：0-故障；1-正常；2-待机；3-离线
+
+    private  Integer alarmLevel; //预警等级：-1 故障;1-红色预警；2-橙色预警；3-黄色预警
+
+    private  Double value; //数值
+
+}

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/DustStatisticsVo.java

@@ -0,0 +1,40 @@
+package cc.admin.modules.dust.vo;
+
+import lombok.Data;
+
+@Data
+public class DustStatisticsVo {
+    /**
+     * 未处理报警数量 (Unprocessed Alarm Count)
+     */
+    private Integer unprocessedAlarmCount; // Corresponds to 0
+
+    /**
+     * 今日报警数量 (Today's Alarm Count)
+     */
+    private Integer todayAlarmCount; // Corresponds to 0
+
+    /**
+     * 累计报警数量 (Cumulative Alarm Count)
+     */
+    private Integer cumulativeAlarmCount; // Corresponds to 0
+
+    /**
+     * 报警处理率 (Alarm Processing Rate)
+     */
+    private Double alarmProcessingRate; // Corresponds to 0
+    /**
+     * 干式除尘监控点位数量 (Dry Dust Removal Monitoring Point Count)
+     */
+    private Integer dryTypeMonitorPointCount; // Value: 9
+
+    /**
+     * 湿式除尘监控点位数量 (Wet Dust Removal Monitoring Point Count)
+     */
+    private Integer wetTypeMonitorPointCount; // Value: 5
+
+    /**
+     * 特定除尘监控点位数量 (Specific/Special Dust Removal Monitoring Point Count)
+     */
+    private Integer specificTypeMonitorPointCount; // Value: 6
+}

cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/RedisDataVo.java

@@ -0,0 +1,18 @@
+package cc.admin.modules.dust.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class RedisDataVo {
+    private  String equipId;
+
+    private  String equipCode;
+
+    private  Integer status; //设备状态：0-故障；1-正常；2-待机；3-离线
+
+    private  Integer alarmLevel; //预警等级：-1 故障;1-红色预警；2-橙色预警；3-黄色预警
+
+    private  Double value; //数值
+}