From 41e8084ef826dc8d98d4d25bf891965ce2af3ad3 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 18 五月 2022 14:56:38 +0800
Subject: [PATCH] 提交代码
---
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgAiBo.java | 1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgNvrBo.java | 4 -
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgReserveIpBo.java | 2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgReserveIpServiceImpl.java | 26 +++++++++++++
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgConstructionBatchVo.java | 4 ++
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java | 16 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java | 1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgReserveIpVo.java | 4 ++
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgConstructionBatchBo.java | 10 ++--
9 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
index 5adb403..b28c06f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
@@ -66,6 +66,7 @@
@GetMapping("/select")
public AjaxResult selectList(BsSchoolBo bo) {
return AjaxResult.success(iBsSchoolService.list(new LambdaQueryWrapper<BsSchool>()
+ .ne(BsSchool::getCode, "0000")
.like(StringUtils.isNotBlank(bo.getName()), BsSchool::getName, bo.getName())));
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgAiBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgAiBo.java
index 0a4201b..62c04d9 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgAiBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgAiBo.java
@@ -66,7 +66,6 @@
* LAN2
*/
@ApiModelProperty(value = "LAN2", required = true)
- @NotBlank(message = "LAN2涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String lanTwo;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgConstructionBatchBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgConstructionBatchBo.java
index 3d492d6..3ba42f8 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgConstructionBatchBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgConstructionBatchBo.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
+import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -46,16 +47,15 @@
* 寮�濮嬫棩鏈�
*/
@ApiModelProperty(value = "寮�濮嬫棩鏈�")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
- private Date startDate;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private LocalDate startDate;
/**
* 缁撴潫鏃ユ湡
*/
@ApiModelProperty(value = "缁撴潫鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
- private Date endDate;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private LocalDate endDate;
/**
* 璐熻矗浜�
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgNvrBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgNvrBo.java
index fbc272a..5586967 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgNvrBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgNvrBo.java
@@ -59,21 +59,19 @@
* ip1
*/
@ApiModelProperty(value = "ip1", required = true)
- @NotBlank(message = "ip1涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+ @NotBlank(message = "IP1涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String ipOne;
/**
* LAN2
*/
@ApiModelProperty(value = "LAN2", required = true)
- @NotBlank(message = "LAN2涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String lanTwo;
/**
* ip2
*/
@ApiModelProperty(value = "ip2", required = true)
- @NotBlank(message = "ip2涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String ipTwo;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgReserveIpBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgReserveIpBo.java
index 6ae920d..539fb5d 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgReserveIpBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SgReserveIpBo.java
@@ -58,7 +58,7 @@
* 鐢宠鏃ユ湡
*/
@ApiModelProperty(value = "鐢宠鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date applicationDate;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgConstructionBatchVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgConstructionBatchVo.java
index c9a9fb7..25ad811 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgConstructionBatchVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgConstructionBatchVo.java
@@ -10,6 +10,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
@@ -46,6 +48,7 @@
*/
@ExcelProperty(value = "寮�濮嬫棩鏈�")
@ApiModelProperty("寮�濮嬫棩鏈�")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date startDate;
/**
@@ -53,6 +56,7 @@
*/
@ExcelProperty(value = "缁撴潫鏃ユ湡")
@ApiModelProperty("缁撴潫鏃ユ湡")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date endDate;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgReserveIpVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgReserveIpVo.java
index d65976e..fb6affb 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgReserveIpVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgReserveIpVo.java
@@ -1,6 +1,7 @@
package com.ruoyi.oa.domain.vo;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -10,6 +11,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
@@ -64,6 +67,7 @@
*/
@ExcelProperty(value = "鐢宠鏃ユ湡")
@ApiModelProperty("鐢宠鏃ユ湡")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date applicationDate;
/**
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java
index 5f511ae..0f76985 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.http.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
@@ -17,6 +19,7 @@
import com.ruoyi.oa.service.ISgNvrService;
import org.springframework.transaction.annotation.Transactional;
+import javax.swing.text.html.HTML;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@@ -62,6 +65,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(SgNvrBo bo) {
+ List<SgNvr> list = baseMapper.selectList(new LambdaQueryWrapper<SgNvr>()
+ .eq(SgNvr::getDeploymentName, bo.getDeploymentName())
+ .eq(SgNvr::getSchoolId, bo.getSchoolId()));
+ if (list.size() > 0) {
+ throw new ServiceException("閮ㄧ讲鍚嶇О閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
SgNvr add = BeanUtil.toBean(bo, SgNvr.class);
validEntityBeforeSave(add);
boolean flag = save(add);
@@ -74,6 +83,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(SgNvrBo bo) {
+ List<SgNvr> list = baseMapper.selectList(new LambdaQueryWrapper<SgNvr>()
+ .ne(SgNvr::getId, bo.getId())
+ .eq(SgNvr::getDeploymentName, bo.getDeploymentName())
+ .eq(SgNvr::getSchoolId, bo.getSchoolId()));
+ if (list.size() > 0) {
+ throw new ServiceException("閮ㄧ讲鍚嶇О閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
SgNvr update = BeanUtil.toBean(bo, SgNvr.class);
validEntityBeforeSave(update);
return updateById(update);
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgReserveIpServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgReserveIpServiceImpl.java
index 421eee2..c6e527f 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgReserveIpServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgReserveIpServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.http.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
@@ -58,6 +60,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(SgReserveIpBo bo) {
+ List<SgReserveIp> ipList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
+ .eq(SgReserveIp::getIp, bo.getIp()).eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
+ if (ipList.size() > 0) {
+ throw new ServiceException("IP鍦板潃閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
+ List<SgReserveIp> macList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
+ .eq(SgReserveIp::getMac, bo.getMac()).eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
+ if (macList.size() > 0) {
+ throw new ServiceException("MAC鍦板潃閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
SgReserveIp add = BeanUtil.toBean(bo, SgReserveIp.class);
validEntityBeforeSave(add);
boolean flag = save(add);
@@ -70,6 +82,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(SgReserveIpBo bo) {
+ List<SgReserveIp> ipList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
+ .ne(SgReserveIp::getId, bo.getId())
+ .eq(SgReserveIp::getIp, bo.getIp())
+ .eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
+ if (ipList.size() > 0) {
+ throw new ServiceException("IP鍦板潃閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
+ List<SgReserveIp> macList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
+ .ne(SgReserveIp::getId, bo.getId())
+ .eq(SgReserveIp::getMac, bo.getMac())
+ .eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
+ if (macList.size() > 0) {
+ throw new ServiceException("MAC鍦板潃閲嶅", HttpStatus.HTTP_PARTIAL);
+ }
SgReserveIp update = BeanUtil.toBean(bo, SgReserveIp.class);
validEntityBeforeSave(update);
return updateById(update);
--
Gitblit v1.9.1