From 06b7c3a60732ad12ee6e26bfbdcf830487ea3516 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 16:39:52 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeGapServiceImpl.java | 3 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java | 30 ++++++++++++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java | 3 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java | 18 ++++++++++++++++++
4 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java
index 867c421..c6051e1 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java
@@ -56,6 +56,21 @@
@OperationLog("Create CodeGap")
@PostMapping("/codeGap/save")
public R save(@RequestBody CodeGap codeGap) {
+ if (codeGap.getCode0() == null || codeGap.getCode1() == null) {
+ return R.error("Save Fail");
+ }
+ if (codeGap.getCode0().equals(codeGap.getCode1())) {
+ return R.error("Save Fail");
+ }
+ if (codeGapService.count(new LambdaQueryWrapper<CodeGap>()
+ .eq(CodeGap::getCode0, codeGap.getCode0())
+ .eq(CodeGap::getCode1, codeGap.getCode1())) > 0 ||
+ codeGapService.count(new LambdaQueryWrapper<CodeGap>()
+ .eq(CodeGap::getCode0, codeGap.getCode1())
+ .eq(CodeGap::getCode1, codeGap.getCode0())) > 0
+ ) {
+ return R.error("Save Fail");
+ }
codeGap.setCreateBy(getLoginUserId());
codeGap.setCreateTime(new Date());
codeGap.setUpdateBy(getLoginUserId());
@@ -70,6 +85,21 @@
@OperationLog("Update CodeGap")
@PostMapping("/codeGap/update")
public R update(@RequestBody CodeGap codeGap) {
+ if (codeGap.getCode0() == null || codeGap.getCode1() == null) {
+ return R.error("Save Fail");
+ }
+ if (codeGap.getCode0().equals(codeGap.getCode1())) {
+ return R.error("Save Fail");
+ }
+ if (codeGapService.count(new LambdaQueryWrapper<CodeGap>()
+ .eq(CodeGap::getCode0, codeGap.getCode0())
+ .eq(CodeGap::getCode1, codeGap.getCode1())) > 0 ||
+ codeGapService.count(new LambdaQueryWrapper<CodeGap>()
+ .eq(CodeGap::getCode0, codeGap.getCode1())
+ .eq(CodeGap::getCode1, codeGap.getCode0())) > 0
+ ) {
+ return R.error("Save Fail");
+ }
codeGap.setUpdateBy(getLoginUserId());
codeGap.setUpdateTime(new Date());
if (!codeGapService.updateById(codeGap)) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
index e1d0eb6..3a3dc37 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
@@ -68,6 +68,21 @@
@OperationLog("Create Route")
@PostMapping("/route/save")
public R save(@RequestBody Route route) {
+ if (route.getStartCode() == null || route.getEndCode() == null) {
+ return R.error("Save Fail");
+ }
+ if (route.getStartCode().equals(route.getEndCode())) {
+ return R.error("Save Fail");
+ }
+ if (routeService.count(new LambdaQueryWrapper<Route>()
+ .eq(Route::getStartCode, route.getStartCode())
+ .eq(Route::getEndCode, route.getEndCode())) > 0 ||
+ routeService.count(new LambdaQueryWrapper<Route>()
+ .eq(Route::getStartCode, route.getStartCode())
+ .eq(Route::getEndCode, route.getEndCode())) > 0
+ ) {
+ return R.error("Save Fail");
+ }
route.setCreateBy(getLoginUserId());
route.setCreateTime(new Date());
route.setUpdateBy(getLoginUserId());
@@ -82,6 +97,9 @@
@OperationLog("Update Route")
@PostMapping("/route/update")
public R update(@RequestBody Route route) {
+ if (route.getStartCode().equals(route.getEndCode())) {
+ return R.error("Update Fail");
+ }
route.setUpdateBy(getLoginUserId());
route.setUpdateTime(new Date());
if (!routeService.updateById(route)) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeGapServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeGapServiceImpl.java
index 1193822..78a5f57 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeGapServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeGapServiceImpl.java
@@ -21,6 +21,9 @@
@Override
public CodeGap createCodeGapByCode(Code code0, Code code1, Long userId) {
+ if (code0.getData().equals(code1.getData())) {
+ return null;
+ }
CodeGap codeGap = findByCodeOfBoth(code0.getId(), code1.getId());
if (null == codeGap) {
Date now = new Date();
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java
index 639d150..eb334aa 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java
@@ -27,6 +27,9 @@
@Override
public Route createRouteByCode(Code code0, Code code1, Integer direction, Long userId) {
+ if (code0.getData().equals(code1.getData())) {
+ return null;
+ }
Route route = this.findByCodeOfBoth(code0.getId(), code1.getId());
direction = Optional.ofNullable(direction).orElse(0);
if (null == route) {
--
Gitblit v1.9.1