From 6017965892db5b414d6788d140c5eab46450250a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 25 九月 2024 08:42:25 +0800
Subject: [PATCH] 11
---
src/main/java/com/se/simu/domain/po/SimuPo.java | 3 ++-
src/main/java/com/se/simu/service/SimuService.java | 9 ++++++++-
src/main/java/com/se/simu/domain/vo/CreateSimuVo.java | 13 ++++++-------
src/main/java/com/se/simu/controller/SimuController.java | 14 ++++++++++----
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index c91ac75..4d6fda0 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -52,8 +52,8 @@
if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) {
return fail("閫夋嫨鑼冨洿涓嶈兘涓虹┖", false);
}
- if (null == vo.getIsFlood() || vo.getIsFlood() < 0) {
- vo.setIsFlood(0);
+ if (null == vo.getPid() || vo.getPid() < 0) {
+ vo.setPid(0);
}
if (StringHelper.isEmpty(vo.getName())) {
vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
@@ -61,8 +61,14 @@
if (null == vo.getNum() || vo.getNum() < 1) {
vo.setNum(simuService.getMaxId() + 1);
}
- if (vo.getIsFlood() > 0) {
- vo.setIsFlood(1);
+ if (null == vo.getPid() || vo.getPid() < 0) {
+ vo.setPid(0);
+ }
+ if (vo.getPid() > 0) {
+ SimuPo pp = simuService.getSimuByPid(vo.getPid());
+ if (null == pp) {
+ return fail("pid涓嶅瓨鍦�");
+ }
if (null == vo.getFloodStart() || vo.getFloodStart() < 1 || vo.getFloodStart() > vo.getDuration() * 60) {
return fail("闃叉睕寮�濮嬫椂闂翠笉鑳戒负绌猴紝涓斿彇鍊煎湪1~" + (vo.getDuration() * 60) + "涔嬮棿");
}
diff --git a/src/main/java/com/se/simu/domain/po/SimuPo.java b/src/main/java/com/se/simu/domain/po/SimuPo.java
index 697dbfd..c9d1d27 100644
--- a/src/main/java/com/se/simu/domain/po/SimuPo.java
+++ b/src/main/java/com/se/simu/domain/po/SimuPo.java
@@ -50,8 +50,9 @@
public SimuPo() {
}
- public SimuPo(Integer num, String name, String data, Integer status, String bak) {
+ public SimuPo(Integer num, Integer pid, String name, String data, Integer status, String bak) {
this.num = num;
+ this.pid = pid;
this.name = name;
this.data = data;
this.status = status;
diff --git a/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java b/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java
index 34298bb..0df9364 100644
--- a/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java
+++ b/src/main/java/com/se/simu/domain/vo/CreateSimuVo.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -44,8 +43,8 @@
@ApiModelProperty("浠跨湡澶囨敞")
private String bak;
- @ApiModelProperty("鏄惁涓洪槻姹�(0-鍚︼紝1-鏄�)")
- private Integer isFlood;
+ @ApiModelProperty("鐖禝D(澶т簬0涓洪槻姹�)")
+ private Integer pid;
@ApiModelProperty("闃叉睕寮�濮嬫椂闂�(绉�)")
private Integer floodStart;
@@ -143,12 +142,12 @@
this.bak = bak;
}
- public Integer getIsFlood() {
- return isFlood;
+ public Integer getPid() {
+ return pid;
}
- public void setIsFlood(Integer isFlood) {
- this.isFlood = isFlood;
+ public void setPid(Integer pid) {
+ this.pid = pid;
}
public Integer getFloodStart() {
diff --git a/src/main/java/com/se/simu/service/SimuService.java b/src/main/java/com/se/simu/service/SimuService.java
index c610c98..346c044 100644
--- a/src/main/java/com/se/simu/service/SimuService.java
+++ b/src/main/java/com/se/simu/service/SimuService.java
@@ -123,12 +123,19 @@
return simuMapper.selectMaxId();
}
+ public SimuPo getSimuByPid(Integer pid) {
+ QueryWrapper<SimuPo> wrapper = new QueryWrapper<>();
+ wrapper.eq("pid", pid);
+
+ return simuMapper.selectOne(wrapper);
+ }
+
public boolean create(CreateSimuVo vo) {
DataPo data = BeanUtil.copyProperties(vo, DataPo.class);
data.setPath(vo.getName(), vo.getName());
initPath(data);
- SimuPo simu = new SimuPo(vo.getNum(), vo.getName(), JSONUtil.toJsonStr(data), 0, vo.getBak());
+ SimuPo simu = new SimuPo(vo.getNum(), vo.getPid(), vo.getName(), JSONUtil.toJsonStr(data), 0, vo.getBak());
int rows = simuMapper.insert(simu);
if (rows > 0) {
--
Gitblit v1.9.3