From 9d3675b12829de9ec46c210c5c8c460705206dbc Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 18 十一月 2023 16:46:48 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentRepairController.java | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentRepairController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentRepairController.java
index 5287bba..d824faf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentRepairController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentRepairController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,17 +12,18 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.MdcEquipmentRepair;
+import org.jeecg.modules.mdc.entity.MdcSystemParameters;
import org.jeecg.modules.mdc.service.IMdcEquipmentRepairService;
+import org.jeecg.modules.mdc.service.IMdcSystemParametersService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcEquipmentRepairVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
/**
* @Description: 璁惧缁翠慨浼戠彮
@@ -34,8 +36,10 @@
@RequestMapping("/mdc/mdcEquipmentRepair")
public class MdcEquipmentRepairController extends JeecgController<MdcEquipmentRepair, IMdcEquipmentRepairService> {
- @Autowired
+ @Resource
private IMdcEquipmentRepairService mdcEquipmentRepairService;
+ @Resource
+ private IMdcSystemParametersService mdcSystemParametersService;
/**
* 璁惧缁翠慨浼戠彮-鏂板
@@ -49,9 +53,27 @@
if (StringUtils.isBlank(repairVo.getEquipmentIds())) {
return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
}
- boolean result = mdcEquipmentRepairService.addMdcRepair(repairVo);
+ boolean result = false;
+ Date date = new Date();
+ String todayDay = DateUtils.format(date, DateUtils.STRDATE);
+ String startTime = DateUtils.format(DateUtils.getFormatDate(repairVo.getStartTime(), DateUtils.STR_DATE_TIME_SMALL), DateUtils.STRDATE);
+ MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
+ if (mdcSystemParameters != null) {
+ String time = mdcSystemParameters.getValue();
+ Date keyDate = DateUtils.setTimeForDay(date, time);
+ if (Integer.parseInt(todayDay) <= Integer.parseInt(startTime)) {
+ result = mdcEquipmentRepairService.addMdcRepair(repairVo);
+ } else if ((Integer.parseInt(todayDay) - Integer.parseInt(startTime)) == 1 && keyDate.after(date)) {
+ result = mdcEquipmentRepairService.addMdcRepair(repairVo);
+ }
+ } else {
+ if (Integer.parseInt(todayDay) > Integer.parseInt(startTime)) {
+ return Result.error("鏂板澶辫触!");
+ }
+ result = mdcEquipmentRepairService.addMdcRepair(repairVo);
+ }
if (!result) {
- return Result.error("鏃堕棿娈垫暟鎹凡缁忓瓨鍦紝璇锋帓鏌ワ紒");
+ return Result.error("鏂板澶辫触锛�");
}
return Result.OK("鏂板鎴愬姛");
}
@@ -75,7 +97,7 @@
}
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- Page page = new Page(pageNo, pageSize);
+ Page<MdcEquipmentRepair> page = new Page<MdcEquipmentRepair>(pageNo, pageSize);
IPage<MdcEquipmentRepair> mdcEquipmentRepairIPage = mdcEquipmentRepairService.pageList(userId, page, repair, req);
return Result.OK(mdcEquipmentRepairIPage);
}
@@ -97,7 +119,25 @@
return Result.error("淇敼澶辫触锛佸師绾綍寮�濮嬫椂闂村皬浜庡綋鍓嶆椂闂达紒");
}
}
- boolean result = mdcEquipmentRepairService.updateMdcRepair(repair);
+ boolean result = false;
+ Date date = new Date();
+ String todayDay = DateUtils.format(date, DateUtils.STRDATE);
+ String startTime = DateUtils.format(repair.getStartTime(), DateUtils.STRDATE);
+ MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
+ if (mdcSystemParameters != null) {
+ String time = mdcSystemParameters.getValue();
+ Date keyDate = DateUtils.setTimeForDay(date, time);
+ if (Integer.parseInt(todayDay) <= Integer.parseInt(startTime)) {
+ result = mdcEquipmentRepairService.updateMdcRepair(repair);
+ } else if ((Integer.parseInt(todayDay) - Integer.parseInt(startTime)) == 1 && keyDate.after(date)) {
+ result = mdcEquipmentRepairService.updateMdcRepair(repair);
+ }
+ } else {
+ if (Integer.parseInt(todayDay) > Integer.parseInt(startTime)) {
+ return Result.error("鍒犻櫎澶辫触!姝ら厤缃凡浣滀负璁惧鍩虹鏁版嵁璁＄畻鏁堢巼锛�");
+ }
+ result = mdcEquipmentRepairService.updateMdcRepair(repair);
+ }
if (!result) {
return Result.error("鏃堕棿娈垫暟鎹凡缁忓瓨鍦紝璇锋帓鏌ワ紒");
}
@@ -115,19 +155,30 @@
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
boolean b = false;
+ Date date = new Date();
MdcEquipmentRepair mdcEquipmentRepair = mdcEquipmentRepairService.getById(id);
- if (mdcEquipmentRepair.getStartTime().before(DateUtils.getTodayZero(DateUtils.getNow()))) {
- //璁板綍寮�濮嬫椂闂村湪浠婂ぉ涔嬪墠
- return Result.error("鍒犻櫎澶辫触!褰撳墠璁板綍宸茶绠楃粺璁℃暟鎹紒");
+ String todayDay = DateUtils.format(date, DateUtils.STRDATE);
+ String startTime = DateUtils.format(mdcEquipmentRepair.getStartTime(), DateUtils.STRDATE);
+ MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
+ if (mdcSystemParameters != null) {
+ String time = mdcSystemParameters.getValue();
+ Date keyDate = DateUtils.setTimeForDay(date, time);
+ // 20230920 20230910 20230922
+ if (Integer.parseInt(todayDay) <= Integer.parseInt(startTime)) {
+ mdcEquipmentRepairService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ } else if ((Integer.parseInt(todayDay) - Integer.parseInt(startTime)) == 1 && keyDate.after(date)) {
+ mdcEquipmentRepairService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
} else {
- //姝ｅ父鍒犻櫎
- b = mdcEquipmentRepairService.removeById(id);
- }
- if (b) {
+ if (Integer.parseInt(todayDay) > Integer.parseInt(startTime)) {
+ return Result.error("鍒犻櫎澶辫触!姝ら厤缃凡浣滀负璁惧鍩虹鏁版嵁璁＄畻鏁堢巼锛�");
+ }
+ mdcEquipmentRepairService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
- } else {
- return Result.error("鍒犻櫎澶辫触");
}
+ return Result.error("鍒犻櫎澶辫触!姝ら厤缃凡浣滀负璁惧鍩虹鏁版嵁璁＄畻鏁堢巼锛�");
}
/**
--
Gitblit v1.9.3