From 1f6790a49aa3b9c028387648188ed6b3bb8c02df Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Sat, 28 Feb 2026 14:27:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=A5=BC=E5=AE=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=87=8C=E7=9A=84=E6=97=A0=E6=95=88=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=97=A0=E6=95=88?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dongjian-dashboard-back-controller/dockerfile | 3 ++- .../mappers/ex/MonitoringPointCategoryGroupMapperExt.xml | 1 + .../MonitoringPointCategoryPageVO.java | 2 ++ .../dashboard/back/service/impl/OverviewServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dongjian-dashboard-back-controller/dockerfile b/dongjian-dashboard-back-controller/dockerfile index 77e7952..b571e8e 100644 --- a/dongjian-dashboard-back-controller/dockerfile +++ b/dongjian-dashboard-back-controller/dockerfile @@ -2,7 +2,8 @@ # FROM openjdk:17-jdk FROM amazoncorretto:17-alpine # 安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包) -RUN apk --no-cache add fontconfig ttf-dejavu +RUN apk --no-cache upgrade && \ + apk --no-cache add fontconfig ttf-dejavu ENV TZ=Asia/Tokyo WORKDIR /home/data-center-dashboard diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml index fbc4e31..f7d00bf 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml @@ -67,6 +67,7 @@ mpc.company_id, mpc.thumbnail_normal_base64, mpc.thumbnail_alarm_base64, + mpc.thumbnail_dis_base64, mpc.`name`, mpc.remark FROM diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/monitoringpointcategory/MonitoringPointCategoryPageVO.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/monitoringpointcategory/MonitoringPointCategoryPageVO.java index 00aa3c4..edee61d 100644 --- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/monitoringpointcategory/MonitoringPointCategoryPageVO.java +++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/monitoringpointcategory/MonitoringPointCategoryPageVO.java @@ -24,4 +24,6 @@ public class MonitoringPointCategoryPageVO { @Schema(description = "告警图标", example = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAalarm") private String thumbnailAlarmBase64; + @Schema(description = "无效图标", example = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAalarm") + private String thumbnailDisBase64; } diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java index 043b5a0..fd5363d 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java @@ -74,8 +74,8 @@ public class OverviewServiceImpl implements OverviewService { mergeOverviewList(buildingInfoList, overviewVOList); // 查找楼宇没有的监测点分类 -// Map> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList); -// mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap); + Map> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList); + mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap); } return SimpleDataResponse.success(buildingInfoList);