bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

智慧厨房

This commit is contained in:
gaowdong 2025-06-20 16:09:28 +08:00
parent 57e561369b
commit bd703a2450
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java
View File

@ -103,6 +103,9 @@ public class KitchenDeviceSensorRecord extends BaseEntity {
@ApiModelProperty(value = "设备细类") @ApiModelProperty(value = "设备细类")
private List<Integer> deviceTypes; private List<Integer> deviceTypes;
@ApiModelProperty(value = "设备编号")
private String deviceNo;
@ApiModelProperty("开始时间") @ApiModelProperty("开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDateTime; private LocalDateTime startDateTime;

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java
View File

@ -57,7 +57,7 @@ public class KitchenDeviceSensorRecordServiceImpl implements IKitchenDeviceSenso
if("temperature".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if("temperature".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) {
if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) {
record.setMeasureData(DeviceSensorResultEnum.TEMPERATURE_HIGH.getDesc()); 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()); record.setMeasureData(DeviceSensorResultEnum.TEMPERATURE_LOW.getDesc());
} else { } else {
record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc());
@ -66,14 +66,14 @@ public class KitchenDeviceSensorRecordServiceImpl implements IKitchenDeviceSenso
if("humidity".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if("humidity".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) {
if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) {
record.setMeasureData(DeviceSensorResultEnum.HUMIDITY_HIGH.getDesc()); 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()); record.setMeasureData(DeviceSensorResultEnum.HUMIDITY_LOW.getDesc());
} else { } else {
record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc());
} }
} }
if("smoke".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { 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()); record.setMeasureData(DeviceSensorResultEnum.SMOKE_HIGH.getDesc());
} else { } else {
record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc());

5
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml
View File

@ -24,13 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="measureType" column="measure_type" /> <result property="measureType" column="measure_type" />
<result property="measureMaxValue" column="measure_max_value" /> <result property="measureMaxValue" column="measure_max_value" />
<result property="measureMinValue" column="measure_min_value" /> <result property="measureMinValue" column="measure_min_value" />
<result property="deviceNo" column="device_no" />
</resultMap> </resultMap>
<sql id="selectKitchenDeviceSensorRecordVo"> <sql id="selectKitchenDeviceSensorRecordVo">
select record_id, batch_no, kdsr.device_id, kdsr.device_type, kdsr.measure_code, measure_data, 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, 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, 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 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_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 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"
) )
</if> </if>
<if test="searchValue != null and searchValue != ''"> <if test="searchValue != null and searchValue != ''">
and (kdsr.device_id like CONCAT('%',#{searchValue},'%') and (kdi.device_no like CONCAT('%',#{searchValue},'%')
or kdi.device_name like CONCAT('%',#{searchValue},'%') or kdi.device_name like CONCAT('%',#{searchValue},'%')
) )
</if> </if>