From c9eea9f24aa52ea59dbb8dcf1cb6cf513ddc74a9 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期五, 25 四月 2025 11:37:32 +0800 Subject: [PATCH] 待机停机维护 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java index e3bc683..ae4d7c1 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDowntimeController.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mdc.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -9,13 +9,10 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.mdc.dto.MdcDowntimeDto; import org.jeecg.modules.mdc.entity.MdcDowntime; -import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime; import org.jeecg.modules.mdc.service.IMdcDowntimeService; import org.jeecg.modules.mdc.vo.MdcDowntimeVo; import org.springframework.web.bind.annotation.*; @@ -73,8 +70,11 @@ @ApiOperation(value = "寰呮満鍋滄満琛�-娣诲姞", notes = "寰呮満鍋滄満琛�-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody MdcDowntime mdcDowntime) { - mdcDowntimeService.save(mdcDowntime); - return Result.OK("娣诲姞鎴愬姛锛�"); + if (StringUtils.isBlank(mdcDowntime.getEquipmentIds())) { + return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡"); + } + boolean flag = mdcDowntimeService.saveDowntime(mdcDowntime); + return flag ? Result.ok("娣诲姞鎴愬姛") : Result.error("娣诲姞澶辫触"); } /** @@ -87,9 +87,9 @@ @ApiOperation(value = "寰呮満鍋滄満琛�-缂栬緫", notes = "寰呮満鍋滄満琛�-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody MdcDowntime mdcDowntime) { - if (mdcDowntime.getReasonId() != null) { - mdcDowntime.setStatus(CommonConstant.DOWNTIME_STATUS_1); - } +// if (mdcDowntime.getReasonId() != null) { +// mdcDowntime.setStatus(CommonConstant.DOWNTIME_STATUS_1); +// } mdcDowntimeService.updateById(mdcDowntime); return Result.OK("缂栬緫鎴愬姛!"); } -- Gitblit v1.9.3