From fad227998050bf14ede2eca9c5507a9120ade4a5 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 5 Dec 2024 11:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=BE=BD=E6=B5=8B=E8=AF=95=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/user/UserReportManageController.java         | 2 +-
 .../device/impl/SupervisionDevMainReportPOServiceImpl.java  | 4 ++++
 .../device/impl/SupervisionTempLineReportServiceImpl.java   | 3 +++
 .../service/user/impl/UserReportPOServiceImpl.java          | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
index dd20b58a1..e4eed4dbd 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
@@ -58,7 +58,7 @@ public class UserReportManageController extends BaseController {
 
     @PostMapping("/update")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
-    @Operation(summary = "重新发起")
+    @ApiOperation("重新发起")
     @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
     public HttpResult<Object> updateUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportParam) {
         String methodDescribe = getMethodDescribe("updateUserReport");
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
index 98d39e4b4..2cd7e4a60 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
@@ -152,6 +152,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
 
     @Override
     public String updateDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParam) {
+        //校验ip
+        if (Objects.equals(supervisionDevMainReportParam.getSaveOrCheckflag(), "2")) {
+            checkIp(supervisionDevMainReportParam, !StringUtils.isEmpty(supervisionDevMainReportParam.getId()));
+        }
         SupervisionDevMainReportPO supervisionDevMainReportPO = this.baseMapper.selectById(supervisionDevMainReportParam.getId());
         //判断是否有权限操作
         InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), supervisionDevMainReportPO.getCreateBy());
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
index 68718ed86..d8762a264 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -110,6 +110,9 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
 
     @Override
     public String updateLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportUpdate supervisionTempLineReportParam) {
+        if (Objects.equals(supervisionTempLineReportParam.getSaveOrCheckflag(), "2")) {
+            checkLineId(supervisionTempLineReportParam, !StringUtils.isEmpty(supervisionTempLineReportParam.getId()));
+        }
         SupervisionTempLineReport supervisionTempLineReport = this.baseMapper.selectById(supervisionTempLineReportParam.getId());
         //判断是否有权限操作
         InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), supervisionTempLineReport.getCreateBy());
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
index a1b7ad329..3b2918ec6 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -112,6 +112,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         //判断工程名称是否有重复的
         if (Objects.equals(userReportParam.getSaveOrCheckflag(), "1")) {
             userReportPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
+            checkProjectName(userReportParam, !StringUtils.isEmpty(userReportParam.getId()));
         } else {
             //常态化干扰源用户信息更新的用的
             if (!Objects.equals(userReportParam.getSaveOrCheckflag(), "0")) {
@@ -186,6 +187,11 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String updateUserReport(UserReportParam.UserReportUpdate userReportParam) {
+        //判断工程名称是否有重复的
+        if (Objects.equals(userReportParam.getSaveOrCheckflag(), "2")) {
+            checkProjectName(userReportParam, !StringUtils.isEmpty(userReportParam.getId()));
+        }
+
         UserReportPO userReportPO = this.baseMapper.selectById(userReportParam.getId());
         //判断是否有权限操作
         InstanceUtil.judgeUserPower(RequestUtil.getUserIndex(), userReportPO.getCreateBy());