From fe2b2b0883548584d6d84dde24c2231b160ee814 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 27 Jun 2025 17:25:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8A=A0kitsetting=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/KitchenHomePageerviceImpl.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) 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 8353db7..cba8dab 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 @@ -5,15 +5,13 @@ import com.bonus.canteen.core.basic.domain.BasicSetting; import com.bonus.canteen.core.basic.mapper.BasicSettingMapper; import com.bonus.canteen.core.kitchen.domain.KitchenDeviceInfo; import com.bonus.canteen.core.kitchen.domain.KitchenDeviceSensorMetric; +import com.bonus.canteen.core.kitchen.domain.KitchenSetting; import com.bonus.canteen.core.kitchen.domain.KitchenStaffInfo; import com.bonus.canteen.core.kitchen.domain.constants.AlarmEnum; import com.bonus.canteen.core.kitchen.domain.constants.StaffWarningEnum; import com.bonus.canteen.core.kitchen.domain.constants.ViolationEnum; import com.bonus.canteen.core.kitchen.dto.IndexHomePageDTO; -import com.bonus.canteen.core.kitchen.mapper.KitchenDeviceInfoMapper; -import com.bonus.canteen.core.kitchen.mapper.KitchenDeviceSensorMetricMapper; -import com.bonus.canteen.core.kitchen.mapper.KitchenHomePageMapper; -import com.bonus.canteen.core.kitchen.mapper.KitchenStaffInfoMapper; +import com.bonus.canteen.core.kitchen.mapper.*; import com.bonus.canteen.core.kitchen.service.IKitchenHomePageService; import com.bonus.canteen.core.kitchen.vo.IndexHomePageInformationVO; import com.bonus.canteen.core.kitchen.vo.IndexMapCountVO; @@ -59,6 +57,9 @@ public class KitchenHomePageerviceImpl implements IKitchenHomePageService { @Resource private BasicSettingMapper basicSettingMapper; + @Resource + private KitchenSettingMapper kitchenSettingMapper; + @Override @@ -87,11 +88,17 @@ public class KitchenHomePageerviceImpl implements IKitchenHomePageService { List selectKitchenStaffInfoList = kitchenStaffInfoMapper.selectKitchenStaffInfoList(null); //获取临期天数 - BasicSetting basicSetting = basicSettingMapper.selectBasicSettingById(12L); - boolean tf = isInteger(basicSetting.getItemValue()); +// BasicSetting basicSetting = basicSettingMapper.selectBasicSettingById(12L); + KitchenSetting kitchenSetting = new KitchenSetting(); + kitchenSetting.setItemName("staff_health_cert_left_day_reminder"); + List kitchenSettingList = kitchenSettingMapper.selectKitchenSettingList(kitchenSetting); + if(kitchenSettingList == null || kitchenSettingList.size() == 0){ + throw new ServiceException("厨房设置项不存在"); + } + boolean tf = isInteger(kitchenSettingList.get(0).getItemValue()); Integer inemValue = 30; if(tf){ - inemValue = Integer.valueOf(basicSetting.getItemValue()); + inemValue = Integer.valueOf(kitchenSettingList.get(0).getItemValue()); } System.err.println("厨房人员信息: " + selectKitchenStaffInfoList); if(selectKitchenStaffInfoList !=null && selectKitchenStaffInfoList.size() > 0){