From 9a618d9ecbd0aa984d297f909989e4985341dd13 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期三, 20 九月 2023 15:27:47 +0800
Subject: [PATCH] 工作日历管理删除功能
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java
index 95cf072..6e02946 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java
@@ -1,8 +1,10 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -11,7 +13,10 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcDeviceCalendar;
+import org.jeecg.modules.mdc.entity.MdcSystemParameters;
import org.jeecg.modules.mdc.service.IMdcDeviceCalendarService;
+import org.jeecg.modules.mdc.service.IMdcSystemParametersService;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.EquipmentCalendarVo;
import org.jeecg.modules.mdc.vo.MdcDeviceCalendarQueryVo;
import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;
@@ -22,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Date;
/**
* @Description: 璁惧宸ヤ綔鏃ュ巻琛�
@@ -37,6 +43,8 @@
@Resource
private IMdcDeviceCalendarService mdcDeviceCalendarService;
+ @Resource
+ private IMdcSystemParametersService mdcSystemParametersService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -105,8 +113,30 @@
@ApiOperation(value = "璁惧宸ヤ綔鏃ュ巻琛�-閫氳繃id鍒犻櫎", notes = "璁惧宸ヤ綔鏃ュ巻琛�-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
- mdcDeviceCalendarService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
+ MdcDeviceCalendar mdcDeviceCalendar = mdcDeviceCalendarService.getById(id);
+ String todayDay = DateUtils.format(new Date(), DateUtils.STRDATE);
+ String effectiveDate = mdcDeviceCalendar.getEffectiveDate();
+ MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
+ boolean b = Integer.parseInt(todayDay) > Integer.parseInt(effectiveDate);
+ if (mdcSystemParameters != null) {
+ String time = mdcSystemParameters.getValue();
+ Date keyDate = DateUtils.setTimeForDay(new Date(), time);
+ // 20230920 20230910 20230922
+ if (Integer.parseInt(todayDay) <= Integer.parseInt(effectiveDate)) {
+ mdcDeviceCalendarService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ } else if (b && keyDate.before(new Date())) {
+ mdcDeviceCalendarService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+ } else {
+ if (b) {
+ return Result.error("鍒犻櫎澶辫触!");
+ }
+ mdcDeviceCalendarService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+ return Result.error("鍒犻櫎澶辫触!");
}
/**
--
Gitblit v1.9.3