From 0fd7fe306c5ba81b7bdada16d1a25403816f269c Mon Sep 17 00:00:00 2001 From: wangwei_123 <1255324804@qq.com> Date: Mon, 16 Jun 2025 16:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=83=A8=E7=BD=B2=E4=B8=80=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cc-admin-api/cc-admin/src/main/resources/application-dust.yml | 10 +++++----- .../cc/admin/modules/dust/controller/TbHomeController.java | 8 ++++---- .../java/cc/admin/modules/dust/entity/TbDustClearrecord.java | 10 +++++++++- .../java/cc/admin/modules/dust/entity/TbDustTargetinfo.java | 4 ++-- .../main/java/cc/admin/modules/dust/entity/TbDustWarning.java | 2 +- .../src/main/java/cc/admin/modules/dust/vo/DustMonitorVo.java | 6 ++++-- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/cc-admin-api/cc-admin/src/main/resources/application-dust.yml b/cc-admin-api/cc-admin/src/main/resources/application-dust.yml index 0a848fd..c30bfae 100644 --- a/cc-admin-api/cc-admin/src/main/resources/application-dust.yml +++ b/cc-admin-api/cc-admin/src/main/resources/application-dust.yml @@ -1,5 +1,5 @@ server: - port: 8890 + port: 2694 tomcat: max-swallow-size: -1 servlet: @@ -135,7 +135,7 @@ spring: # 多数据源配置 #redis 配置 redis: - database: 0 + database: 5 host: 127.0.0.1 lettuce: pool: @@ -236,7 +236,7 @@ swagger: influxdb: enable: true - url: http://127.0.0.1:8086 + url: http://192.168.0.206:8199 username: admin - password: root - defaultDatabase: dust \ No newline at end of file + password: Gsking164411 + defaultDatabase: dl_history \ No newline at end of file diff --git a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbHomeController.java b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbHomeController.java index 0339350..4dbe5a3 100644 --- a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbHomeController.java +++ b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/controller/TbHomeController.java @@ -88,21 +88,21 @@ public class TbHomeController { List monitorVoList = new ArrayList<>(); - HashMap> hashMap = new HashMap<>(); List list = tbDustTargetinfoService.lambdaQuery() .eq(TbDustTargetinfo::getEquipId, equipId) .list(); Map dustdata = redisUtil.hmget(KeyUtils.dustdataTag); for (TbDustTargetinfo targetinfo : list) { DustMonitorVo dustMonitorVo = new DustMonitorVo(); - RedisDataVo redisDataVo = (RedisDataVo) dustdata.get(targetinfo.getTargetCode()); + /* 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); + dustMonitorVo.setTargetId(targetinfo.getId()); + monitorVoList.add(dustMonitorVo); } return Result.ok(monitorVoList); } diff --git a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustClearrecord.java b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustClearrecord.java index 5667233..2fbb896 100644 --- a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustClearrecord.java +++ b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustClearrecord.java @@ -39,6 +39,14 @@ public class TbDustClearrecord { @Excel(name = "数据接入标识，与粉尘企业区域图清单对应：1-粉尘企业区域图清单，2-粉尘企业（个体/小型）定期清理清单，3-风管、设备皮膜内部定期清理清单，4-干式单机等常用清理清单；多个用途逗号分隔", width = 15) @ApiModelProperty(value = "数据接入标识，与粉尘企业区域图清单对应：1-粉尘企业区域图清单，2-粉尘企业（个体/小型）定期清理清单，3-风管、设备皮膜内部定期清理清单，4-干式单机等常用清理清单；多个用途逗号分隔") private String dataId; + + /** + * 除尘系统id + */ + @Excel(name = "除尘系统id", width = 15) + @ApiModelProperty(value = "除尘系统id") + private String equipId; + /** * 清理项目 */ @@ -99,5 +107,5 @@ public class TbDustClearrecord { @Excel(name = "删除标记：0-未删除，1-已删除", width = 15) @ApiModelProperty(value = "删除标记：0-未删除，1-已删除") @TableLogic - private String delFlag; + private Integer delFlag; } diff --git a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustTargetinfo.java b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustTargetinfo.java index fb7dc6e..a1ca674 100644 --- a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustTargetinfo.java +++ b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustTargetinfo.java @@ -123,14 +123,14 @@ public class TbDustTargetinfo { */ @Excel(name = "位号", width = 15) @ApiModelProperty(value = "位号") - private String alarmTime; + private Integer alarmTime; /** * 位号 */ @Excel(name = "报警持续时间(视为报警)", width = 15) @ApiModelProperty(value = "报警持续时间(视为报警)") - private String alarmDataRepeatedly; + private Integer alarmDataRepeatedly; /** * 描述 diff --git a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustWarning.java b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustWarning.java index 7523811..22c0dfc 100644 --- a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustWarning.java +++ b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/entity/TbDustWarning.java @@ -76,7 +76,7 @@ public class TbDustWarning { */ @Excel(name = "预警等级：1-红色预警；2-橙色预警；3-黄色预警", width = 15) @ApiModelProperty(value = "预警等级：1-红色预警；2-橙色预警；3-黄色预警") - private String rank; + private String alarmLevel; /** * 预警起始时间 */ diff --git a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/DustMonitorVo.java b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/DustMonitorVo.java index 7e64cf0..9c9840c 100644 --- a/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/DustMonitorVo.java +++ b/cc-admin-api/dust/src/main/java/cc/admin/modules/dust/vo/DustMonitorVo.java @@ -7,6 +7,8 @@ public class DustMonitorVo { private String equipId; + private String targetId; + private String equipCode; private String targetCode; @@ -15,9 +17,9 @@ public class DustMonitorVo { private String targetType; - private Integer type; //是否启停信号 + private Integer type; //是否是启停信号(0，否，1，是）', - private Integer status; //设备状态：0-故障；1-正常；2-待机；3-离线 + private Integer status; //设备状态：0-故障；1-正常；2-离线 private Integer alarmLevel; //预警等级：-1 故障;1-红色预警；2-橙色预警；3-黄色预警