From bd703a2450977347c90aed78ad28202edce2f5d1 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 20 Jun 2025 16:09:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=8E=A8=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/kitchen/domain/KitchenDeviceSensorRecord.java | 3 +++ .../service/impl/KitchenDeviceSensorRecordServiceImpl.java | 6 +++--- .../mapper/kitchen/KitchenDeviceSensorRecordMapper.xml | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java index db23cf8..ee68db8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java @@ -103,6 +103,9 @@ public class KitchenDeviceSensorRecord extends BaseEntity { @ApiModelProperty(value = "设备细类") private List deviceTypes; + @ApiModelProperty(value = "设备编号") + private String deviceNo; + @ApiModelProperty("开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java index a9be510..eec84a7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java @@ -57,7 +57,7 @@ public class KitchenDeviceSensorRecordServiceImpl implements IKitchenDeviceSenso if("temperature".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { record.setMeasureData(DeviceSensorResultEnum.TEMPERATURE_HIGH.getDesc()); - }else if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) < 0) { + }else if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMinValue()) < 0) { record.setMeasureData(DeviceSensorResultEnum.TEMPERATURE_LOW.getDesc()); } else { record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); @@ -66,14 +66,14 @@ public class KitchenDeviceSensorRecordServiceImpl implements IKitchenDeviceSenso if("humidity".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { record.setMeasureData(DeviceSensorResultEnum.HUMIDITY_HIGH.getDesc()); - }else if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) < 0) { + }else if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMinValue()) < 0) { record.setMeasureData(DeviceSensorResultEnum.HUMIDITY_LOW.getDesc()); } else { record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); } } if("smoke".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { - if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { + if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMinValue()) > 0) { record.setMeasureData(DeviceSensorResultEnum.SMOKE_HIGH.getDesc()); } else { record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml index ef2015e..fa581aa 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml @@ -24,13 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select record_id, batch_no, kdsr.device_id, kdsr.device_type, kdsr.measure_code, measure_data, gateway_device_id, device_time, kdsr.sub_place, kdsr.canteen_id, kdsr.area_id, kdsr.create_by, kdsr.create_time, kdsr.update_by, kdsr.update_time, kdi.device_name, bc.canteen_name, - kdsm.measure_type, kdsm.measure_max_value, kdsm.measure_min_value + kdsm.measure_type, kdsm.measure_max_value, kdsm.measure_min_value, kdi.device_no from kitchen_device_sensor_record kdsr left join kitchen_device_sensor_metric kdsm on kdsm.measure_code = kdsr.measure_code and kdsm.device_type = kdsr.device_type left join kitchen_device_info kdi on kdi.device_id = kdsr.device_id @@ -102,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - and (kdsr.device_id like CONCAT('%',#{searchValue},'%') + and (kdi.device_no like CONCAT('%',#{searchValue},'%') or kdi.device_name like CONCAT('%',#{searchValue},'%') )