diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteDealController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteDealController.java index 07a5864..9a5ab3b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteDealController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteDealController.java @@ -2,6 +2,8 @@ package com.bonus.canteen.core.kitchen.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.kitchen.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -42,8 +44,8 @@ public class KitchenWasteDealController extends BaseController { */ @ApiOperation(value = "查询厨房废弃物处置列表") //@RequiresPermissions("kitchen:deal:list") - @GetMapping("/list") - public TableDataInfo list(KitchenWasteDeal kitchenWasteDeal) { + @PostMapping("/list") + public TableDataInfo list(@RequestBody @Valid KitchenWasteDeal kitchenWasteDeal) { startPage(); List list = kitchenWasteDealService.selectKitchenWasteDealList(kitchenWasteDeal); return getDataTable(list); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteMealController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteMealController.java index b3ecf20..d007aac 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteMealController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenWasteMealController.java @@ -2,6 +2,8 @@ package com.bonus.canteen.core.kitchen.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.kitchen.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -42,8 +44,8 @@ public class KitchenWasteMealController extends BaseController { */ @ApiOperation(value = "查询厨房餐余浪费列表") //@RequiresPermissions("kitchen:meal:list") - @GetMapping("/list") - public TableDataInfo list(KitchenWasteMeal kitchenWasteMeal) { + @PostMapping("/list") + public TableDataInfo list(@RequestBody @Valid KitchenWasteMeal kitchenWasteMeal) { startPage(); List list = kitchenWasteMealService.selectKitchenWasteMealList(kitchenWasteMeal); return getDataTable(list); 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 e0413f2..cfba2fe 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 @@ -86,9 +86,6 @@ public class KitchenDeviceSensorRecord extends BaseEntity { @ApiModelProperty(value = "食堂名称") private String canteenName; - @ApiModelProperty(value = "测量结果名称") - private String sensorResultTypeName; - @ApiModelProperty(value = "测量指标类型") private Integer measureType; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java index 59e2940..2d65ef9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.kitchen.domain; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; @@ -81,5 +82,11 @@ public class KitchenWasteDeal extends BaseEntity { @ApiModelProperty(value = "处理人id") private Long staffId; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime endDateTime; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java index 8aae4c0..f8a28f8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteMeal.java @@ -1,5 +1,6 @@ package com.bonus.canteen.core.kitchen.domain; +import java.time.LocalDateTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; @@ -50,5 +51,18 @@ public class KitchenWasteMeal extends BaseEntity { @ApiModelProperty(value = "附件") private String fileUrl; + @ApiModelProperty(value = "食堂名称") + private String canteenName; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime startDateTime; + + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDateTime endDateTime; + + @Excel(name = "区域Id") + @ApiModelProperty(value = "厨余汇总") + private Long wasteMealCount; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/constants/WasteDealTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/constants/WasteDealTypeEnum.java new file mode 100644 index 0000000..50d5cc7 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/constants/WasteDealTypeEnum.java @@ -0,0 +1,32 @@ +package com.bonus.canteen.core.kitchen.domain.constants; + +public enum WasteDealTypeEnum { + DISCARD(1, "丢弃"), + NEXT_MEAL_USE(2, "下一餐使用"), + COLLECT_SELLING(3, "集中售卖"); + + private final Integer key; + + private final String desc; + + private WasteDealTypeEnum(Integer key, String desc) { + this.key = key; + this.desc = desc; + } + public Integer getKey() { + return this.key; + } + + public String getDesc() { + return this.desc; + } + + public static String getDescByKey(Integer targetKey) { + for (WasteDealTypeEnum dealTypeEnum : WasteDealTypeEnum.values()) { + if (dealTypeEnum.getKey().equals(targetKey)) { + return dealTypeEnum.getDesc(); + } + } + return ""; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenWasteMealMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenWasteMealMapper.java index 3b0d59d..156ab0f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenWasteMealMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenWasteMealMapper.java @@ -5,14 +5,14 @@ import com.bonus.canteen.core.kitchen.domain.KitchenWasteMeal; /** * 厨房餐余浪费Mapper接口 - * + * * @author xsheng * @date 2025-06-16 */ public interface KitchenWasteMealMapper { /** * 查询厨房餐余浪费 - * + * * @param ledgerId 厨房餐余浪费主键 * @return 厨房餐余浪费 */ @@ -20,7 +20,7 @@ public interface KitchenWasteMealMapper { /** * 查询厨房餐余浪费列表 - * + * * @param kitchenWasteMeal 厨房餐余浪费 * @return 厨房餐余浪费集合 */ @@ -28,7 +28,7 @@ public interface KitchenWasteMealMapper { /** * 新增厨房餐余浪费 - * + * * @param kitchenWasteMeal 厨房餐余浪费 * @return 结果 */ @@ -36,7 +36,7 @@ public interface KitchenWasteMealMapper { /** * 修改厨房餐余浪费 - * + * * @param kitchenWasteMeal 厨房餐余浪费 * @return 结果 */ @@ -44,7 +44,7 @@ public interface KitchenWasteMealMapper { /** * 删除厨房餐余浪费 - * + * * @param ledgerId 厨房餐余浪费主键 * @return 结果 */ @@ -52,9 +52,17 @@ public interface KitchenWasteMealMapper { /** * 批量删除厨房餐余浪费 - * + * * @param ledgerIds 需要删除的数据主键集合 * @return 结果 */ public int deleteKitchenWasteMealByLedgerIds(Long[] ledgerIds); + + /** + * 查询厨房餐余浪费汇总 + * + * @param kitchenWasteMeal 厨房餐余浪费 + * @return 厨房餐余浪费集合 + */ + public List selectKitchenWasteMealListCount(KitchenWasteMeal kitchenWasteMeal); } 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 0b16a9c..fb005b7 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 @@ -51,27 +51,27 @@ public class KitchenDeviceSensorRecordServiceImpl implements IKitchenDeviceSenso kitchenDeviceSensorRecordList.forEach(record -> { if("temperature".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { - record.setSensorResultTypeName(DeviceSensorResultEnum.TEMPERATURE_HIGH.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.TEMPERATURE_HIGH.getDesc()); }else if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) < 0) { - record.setSensorResultTypeName(DeviceSensorResultEnum.TEMPERATURE_LOW.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.TEMPERATURE_LOW.getDesc()); } else { - record.setSensorResultTypeName(DeviceSensorResultEnum.NORMAL.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); } } if("humidity".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { - record.setSensorResultTypeName(DeviceSensorResultEnum.HUMIDITY_HIGH.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.HUMIDITY_HIGH.getDesc()); }else if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) < 0) { - record.setSensorResultTypeName(DeviceSensorResultEnum.HUMIDITY_LOW.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.HUMIDITY_LOW.getDesc()); } else { - record.setSensorResultTypeName(DeviceSensorResultEnum.NORMAL.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.NORMAL.getDesc()); } } if("smoke".equals(record.getMeasureCode()) && StringUtils.isNotBlank(record.getMeasureData())) { if(new BigDecimal(record.getMeasureData()).compareTo(record.getMeasureMaxValue()) > 0) { - record.setSensorResultTypeName(DeviceSensorResultEnum.SMOKE_HIGH.getDesc()); + record.setMeasureData(DeviceSensorResultEnum.SMOKE_HIGH.getDesc()); } else { - record.setSensorResultTypeName(DeviceSensorResultEnum.NORMAL.getDesc()); + 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 11922a6..d73df52 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 @@ -101,10 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - and kdsr.create_time = ]]> #{startDateTime} + and kdsr.device_time = ]]> #{startDateTime} - and kdsr.create_time #{endDateTime} + and kdsr.device_time #{endDateTime} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml index 596503c..e78bcf7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml @@ -58,10 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - and kscr.create_time = ]]> #{startDateTime} + and kscr.operate_date = ]]> #{startDateTime} - and kscr.create_time #{endDateTime} + and kscr.operate_date #{endDateTime} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml index 229b721..e8be3d3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml @@ -86,6 +86,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or bd.dishes_name like CONCAT('%',#{searchValue},'%') ) + + and ksdr.sample_save_time = ]]> #{startDateTime} + + + and ksdr.sample_save_time #{endDateTime} + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffIllegalWarningMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffIllegalWarningMapper.xml index 9645f16..118319f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffIllegalWarningMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffIllegalWarningMapper.xml @@ -59,10 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - and ksiw.create_time = ]]> #{startDateTime} + and ksiw.record_time = ]]> #{startDateTime} - and ksiw.create_time #{endDateTime} + and ksiw.record_time #{endDateTime} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffMorningCheckMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffMorningCheckMapper.xml index c697bfd..bb327f5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffMorningCheckMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffMorningCheckMapper.xml @@ -58,10 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and ksmc.create_time = ]]> #{startDateTime} + and ksmc.record_time = ]]> #{startDateTime} - and ksmc.create_time #{endDateTime} + and ksmc.record_time #{endDateTime} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml index 67db789..88ffc8b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteDealMapper.xml @@ -23,7 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select waste_id, weight, garbage_name, action_date, device_id, mealtime_type, canteen_id, area_id, deal_type, sale_amount, scene_picture, staff_id, create_by, create_time, update_by, update_time from kitchen_waste_deal + select waste_id, weight, garbage_name, action_date, device_id, mealtime_type, + kwd.canteen_id, kwd.area_id, deal_type, sale_amount, scene_picture, kwd.staff_id, + kwd.create_by, kwd.create_time, kwd.update_by, kwd.update_time + from kitchen_waste_deal kwd + left join basic_canteen bc on kwd.canteen_id = bc.canteen_id + left join kitchen_staff_info ksi on kwd.staff_id = ksi.staff_id + left join sys_user su on ksi.user_id = su.user_id diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml index 1ce0f36..181984e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenWasteMealMapper.xml @@ -15,10 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select ledger_id, ledger_time, mealtime_type, canteen_id, area_id, file_url, remark, create_by, create_time, update_by, update_time from kitchen_waste_meal + select ledger_id, ledger_time, mealtime_type, kwm.canteen_id, kwm.area_id, file_url, remark, + kwm.create_by, kwm.create_time, kwm.update_by, kwm.update_time, bc.canteen_name + from kitchen_waste_meal kwm + left join basic_canteen bc on bc.canteen_id = kwm.canteen_id @@ -92,4 +103,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{ledgerId} + + \ No newline at end of file