From 6583079674f4cdcfdfbdd18f246c9bc37f3f1a7e Mon Sep 17 00:00:00 2001 From: xiachao Date: Wed, 25 Dec 2024 13:19:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=9C=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/screen/dto/IotEnterpriseDashboardDTO.java | 4 ++-- .../impl/IotEnterpriseDashboardServiceImpl.java | 2 +- .../service/impl/IotVisualComponentServiceImpl.java | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/screen/dto/IotEnterpriseDashboardDTO.java b/modules/thing/src/main/java/com/thing/screen/dto/IotEnterpriseDashboardDTO.java index a6e154a..f59a8a4 100644 --- a/modules/thing/src/main/java/com/thing/screen/dto/IotEnterpriseDashboardDTO.java +++ b/modules/thing/src/main/java/com/thing/screen/dto/IotEnterpriseDashboardDTO.java @@ -38,11 +38,11 @@ public class IotEnterpriseDashboardDTO implements Serializable { @Schema(description = "创建者") private Long creator; @Schema(description = "创建时间") - private Date createDate; + private Long createDate; @Schema(description = "更新者") private Long updater; @Schema(description = "更新时间") - private Date updateDate; + private Long updateDate; @Schema(description = "大屏名称") private String largeScreenName; @Schema(description = "背景图片地址") diff --git a/modules/thing/src/main/java/com/thing/screen/service/impl/IotEnterpriseDashboardServiceImpl.java b/modules/thing/src/main/java/com/thing/screen/service/impl/IotEnterpriseDashboardServiceImpl.java index c860cce..3ff9c82 100644 --- a/modules/thing/src/main/java/com/thing/screen/service/impl/IotEnterpriseDashboardServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/screen/service/impl/IotEnterpriseDashboardServiceImpl.java @@ -137,7 +137,7 @@ public class IotEnterpriseDashboardServiceImpl extends BaseServiceImpl dashboardList(String tenantCode) { QueryWrapper wrapper = new QueryWrapper(); - wrapper.eq("tenant_code", tenantCode, ObjectUtil.isNotEmpty(tenantCode)); + wrapper.eq("tenant_code", Long.valueOf(tenantCode), ObjectUtil.isNotEmpty(tenantCode)); return ConvertUtils.sourceToTarget(iotDashboardGroupDao.selectListByQuery(wrapper),IotDashboardGroupDTO.class); } diff --git a/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java index 017be9a..7d537e1 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java @@ -129,10 +129,12 @@ public class IotVisualComponentServiceImpl extends BaseServiceImpl{ IotVisualGroupEntity group = iotVisualGroupService.getById(temp.getGroupId()); - temp.setGroupName(group.getName()); - temp.setGroupBusinessName(group.getBusinessName()); - temp.setGroupSort(group.getSort()); - temp.setGroupBSort(group.getBsSort()); + if(ObjectUtils.isNotEmpty(group)){ + temp.setGroupName(group.getName()); + temp.setGroupBusinessName(group.getBusinessName()); + temp.setGroupSort(group.getSort()); + temp.setGroupBSort(group.getBsSort()); + } }); return dtoPageData; }