diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenCameraSettingController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenCameraSettingController.java index 356530a..5c4a99c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenCameraSettingController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenCameraSettingController.java @@ -2,6 +2,8 @@ package com.bonus.canteen.core.kitchen.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.bonus.canteen.core.kitchen.domain.KitchenSetting; import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.kitchen.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -105,6 +107,19 @@ public class KitchenCameraSettingController extends BaseController { } } + @ApiOperation(value = "恢复默认值") + //@PreventRepeatSubmit + //@RequiresPermissions("kitchen:setting:edit") + @SysLog(title = "恢复默认值", businessType = OperaType.UPDATE, logType = 1,module = "食堂管理->恢复默认值") + @PostMapping("/batchToDefault") + public AjaxResult batchToDefault(@RequestBody List list) { + try { + return toAjax(kitchenCameraSettingService.batchToDefault(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/KitchenCameraSetting.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenCameraSetting.java index 6d8c277..69dc6b8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenCameraSetting.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenCameraSetting.java @@ -1,5 +1,7 @@ package com.bonus.canteen.core.kitchen.domain; +import java.sql.Time; +import java.time.LocalTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; @@ -31,15 +33,15 @@ public class KitchenCameraSetting extends BaseEntity { /** 开始时间 */ @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "开始时间", width = 30, dateFormat = "HH:mm:ss") + private LocalTime startTime; /** 结束时间 */ @ApiModelProperty(value = "结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "结束时间", width = 30, dateFormat = "HH:mm:ss") + private LocalTime endTime; /** 抓拍频率 */ @Excel(name = "抓拍频率") @@ -48,15 +50,15 @@ public class KitchenCameraSetting extends BaseEntity { /** 默认开始时间 */ @ApiModelProperty(value = "默认开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "默认开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date defaultStartTime; + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "默认开始时间", width = 30, dateFormat = "HH:mm:ss") + private LocalTime defaultStartTime; /** 默认结束时间 */ @ApiModelProperty(value = "默认结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "默认结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date defaultEndTime; + @JsonFormat(pattern = "HH:mm:ss") + @Excel(name = "默认结束时间", width = 30, dateFormat = "HH:mm:ss") + private LocalTime defaultEndTime; /** 默认抓拍频率 */ @Excel(name = "默认抓拍频率") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenCameraSettingMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenCameraSettingMapper.java index 1feb50d..a57f51a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenCameraSettingMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenCameraSettingMapper.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.kitchen.mapper; import java.util.List; import com.bonus.canteen.core.kitchen.domain.KitchenCameraSetting; +import com.bonus.canteen.core.kitchen.domain.KitchenSetting; /** * 功能参数配置Mapper接口 @@ -42,6 +43,8 @@ public interface KitchenCameraSettingMapper { */ public int updateKitchenCameraSetting(KitchenCameraSetting kitchenCameraSetting); + public int batchToDefault(KitchenCameraSetting kitchenCameraSetting); + /** * 删除功能参数配置 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenCameraSettingService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenCameraSettingService.java index f621807..2f5ea32 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenCameraSettingService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenCameraSettingService.java @@ -42,6 +42,8 @@ public interface IKitchenCameraSettingService { */ public int updateKitchenCameraSetting(KitchenCameraSetting kitchenCameraSetting); + public int batchToDefault(List list); + /** * 批量删除功能参数配置 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenCameraSettingServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenCameraSettingServiceImpl.java index f0f61fd..c9d9855 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenCameraSettingServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenCameraSettingServiceImpl.java @@ -1,8 +1,11 @@ package com.bonus.canteen.core.kitchen.service.impl; import java.util.List; + +import com.bonus.canteen.core.kitchen.domain.KitchenSetting; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.canteen.core.kitchen.mapper.KitchenCameraSettingMapper; @@ -74,6 +77,21 @@ public class KitchenCameraSettingServiceImpl implements IKitchenCameraSettingSer } } + @Override + public int batchToDefault(List list) { + int count = 0; + for (KitchenCameraSetting kitchenCameraSetting : list) { + kitchenCameraSetting.setUpdateTime(DateUtils.getNowDate()); + kitchenCameraSetting.setUpdateBy(SecurityUtils.getUsername()); + try { + count += kitchenCameraSettingMapper.batchToDefault(kitchenCameraSetting); + } catch (Exception e) { + throw new ServiceException(e.getMessage()); + } + } + return count; + } + /** * 批量删除功能参数配置 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenCameraSettingMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenCameraSettingMapper.xml index 0580c71..3b20b9f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenCameraSettingMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenCameraSettingMapper.xml @@ -98,6 +98,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update kitchen_camera_setting + set start_time = default_start_time, end_time = default_end_time, frequency = default_frequency + where item_name = #{itemName} + + delete from kitchen_camera_setting where id = #{id}