From 4169cf7d3a765597957a4927e8c5e826d8e9e44c Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Tue, 24 Jun 2025 16:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=81=E7=B3=BB=E7=BB=9F=E9=A6=96=E9=A1=B5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KitchenDeviceInfoController.java | 2 +- .../kitchen/domain/KitchenDeviceInfo.java | 5 ++++- .../core/kitchen/dto/IndexHomePageDTO.java | 5 +++++ .../service/IKitchenDeviceInfoService.java | 2 +- .../impl/KitchenDeviceInfoServiceImpl.java | 19 ++++++++++--------- .../impl/KitchenHomePageerviceImpl.java | 1 - .../core/kitchen/vo/KitchenDeviceListVO.java | 3 +++ 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java index df3feab..c2fb331 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java @@ -56,7 +56,7 @@ public class KitchenDeviceInfoController extends BaseController { @GetMapping("/select") public AjaxResult select(KitchenDeviceListDTO kitchenDeviceInfo) { try{ - List list = kitchenDeviceInfoService.selectKitchenDeviceInfoSelect(kitchenDeviceInfo); + List list = kitchenDeviceInfoService.selectKitchenDeviceInfoSelect(kitchenDeviceInfo); return success(list); }catch (Exception e) { return error(e.getMessage()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java index 0ba4bd7..302585c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java @@ -74,7 +74,10 @@ public class KitchenDeviceInfo extends Model { /** 所在位置 */ @Excel(name = "所在位置") @ApiModelProperty(value = "所在位置") - private String subPlace; + private Integer subPlace; + + @ApiModelProperty(value = "所在位置名称") + private String subPlaceName; /** 设备是否在线 1 在线 2 离线 */ @Excel(name = "设备是否在线 1 在线 2 离线") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java index 925b710..9a23195 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.kitchen.dto; import lombok.Data; import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; import java.time.LocalDateTime; @@ -14,12 +15,16 @@ import java.time.LocalDateTime; @ToString public class IndexHomePageDTO { + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate deviceStartTime; // 当前时间 + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate deviceEndTime; // 厨房名称 + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate sampleStartTime; // 留样机开始时间 + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate sampleEndTime; // 留样机结束时间 } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java index 0324d42..4e2bf7d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java @@ -63,7 +63,7 @@ public interface IKitchenDeviceInfoService extends IService { */ public int deleteKitchenDeviceInfoByDeviceId(Long deviceId); - List selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo); + List selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo); Map deviceType(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java index 780cebf..3dfef94 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java @@ -203,15 +203,16 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo) { - return kitchenDeviceInfoMapper.selectList( - Wrappers.lambdaQuery() - .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceName()), KitchenDeviceInfo::getDeviceName, kitchenDeviceInfo.getDeviceName()) - .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceNo()), KitchenDeviceInfo::getDeviceNo, kitchenDeviceInfo.getDeviceNo()) - .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceSn()), KitchenDeviceInfo::getDeviceSn, kitchenDeviceInfo.getDeviceSn()) - .eq(kitchenDeviceInfo.getDeviceType() != 0, KitchenDeviceInfo::getDeviceType, kitchenDeviceInfo.getDeviceType()) - .eq(KitchenDeviceInfo::getDelFlag, DelFlagEnum.DEL_FALSE.key()) // 仅查询未删除的设备 - ); + public List selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo) { +// return kitchenDeviceInfoMapper.selectList( +// Wrappers.lambdaQuery() +// .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceName()), KitchenDeviceInfo::getDeviceName, kitchenDeviceInfo.getDeviceName()) +// .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceNo()), KitchenDeviceInfo::getDeviceNo, kitchenDeviceInfo.getDeviceNo()) +// .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceSn()), KitchenDeviceInfo::getDeviceSn, kitchenDeviceInfo.getDeviceSn()) +// .eq(kitchenDeviceInfo.getDeviceType() != 0, KitchenDeviceInfo::getDeviceType, kitchenDeviceInfo.getDeviceType()) +// .eq(KitchenDeviceInfo::getDelFlag, DelFlagEnum.DEL_FALSE.key()) // 仅查询未删除的设备 +// ); + return kitchenDeviceInfoMapper.selectKitchenDeviceInfoList(kitchenDeviceInfo); } @Override diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java index 8cbce22..bf167f9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java @@ -241,7 +241,6 @@ public class KitchenHomePageerviceImpl implements IKitchenHomePageService { } indexHomePageInformationVO.setDeviceCount(Integer.valueOf(deviceInfoCount.toString())); - indexHomePageInformationVO.setEmployeeViolation(employeeViolation); indexHomePageInformationVO.setEnvironmentalAlarm(environmentaAlarm); indexHomePageInformationVO.setHistoricalWarningCount(historicalWarningCount); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java index 6c21933..77c8a02 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java @@ -65,6 +65,9 @@ public class KitchenDeviceListVO { @ApiModelProperty(value = "所在位置") private String subPlace; + @ApiModelProperty(value = "所在位置名称") + private String subPlaceName; + /** 设备是否在线 1 在线 2 离线 */ @ApiModelProperty(value = "设备是否在线 1 在线 2 离线") private Integer deviceNetworkState;