Browse Source

开启楼宇列表里的无效类别判定,增加无效图片返回

ppt-20260120
zhczyx@163.com 1 month ago
parent
commit
1f6790a49a
  1. 3
      dongjian-dashboard-back-controller/dockerfile
  2. 1
      dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml
  3. 2
      dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/monitoringpointcategory/MonitoringPointCategoryPageVO.java
  4. 4
      dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java

3
dongjian-dashboard-back-controller/dockerfile

@ -2,7 +2,8 @@
# FROM openjdk:17-jdk # FROM openjdk:17-jdk
FROM amazoncorretto:17-alpine FROM amazoncorretto:17-alpine
# 安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包) # 安装 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 ENV TZ=Asia/Tokyo
WORKDIR /home/data-center-dashboard WORKDIR /home/data-center-dashboard

1
dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml

@ -67,6 +67,7 @@
mpc.company_id, mpc.company_id,
mpc.thumbnail_normal_base64, mpc.thumbnail_normal_base64,
mpc.thumbnail_alarm_base64, mpc.thumbnail_alarm_base64,
mpc.thumbnail_dis_base64,
mpc.`name`, mpc.`name`,
mpc.remark mpc.remark
FROM FROM

2
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") @Schema(description = "告警图标", example = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAalarm")
private String thumbnailAlarmBase64; private String thumbnailAlarmBase64;
@Schema(description = "无效图标", example = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAalarm")
private String thumbnailDisBase64;
} }

4
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); mergeOverviewList(buildingInfoList, overviewVOList);
// 查找楼宇没有的监测点分类 // 查找楼宇没有的监测点分类
// Map<Long, List<Long>> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList); Map<Long, List<Long>> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList);
// mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap); mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap);
} }
return SimpleDataResponse.success(buildingInfoList); return SimpleDataResponse.success(buildingInfoList);

Loading…
Cancel
Save