From fbc05720af8eaab3d0fe23a30f33e8e753fff17e Mon Sep 17 00:00:00 2001
From: yuwanchiren <863666755@qq.com>
Date: Wed, 16 Oct 2024 17:38:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/equipment/equipmentManagement/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 4f4d4bc4..4d7e2f15 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -203,7 +203,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editDeviceData.objectType == '风电场' ? '装机容量:' : '额定容量:'">
+                            <el-form-item :label="editDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
                                 <el-input-number
                                     style="width: 200px"
                                     :controls="false"
@@ -374,7 +374,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editAddDeviceData.objectType == '风电场' ? '装机容量:' : '额定容量:'">
+                            <el-form-item :label="editAddDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
                                 <el-input-number
                                     style="width: 200px"
                                     :controls="false"

From 1d42ee709dd35aff980d6d21c0b738b766987b7e Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Thu, 17 Oct 2024 09:37:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[301]=20=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=20=E6=B2=A1=E5=81=9A=E5=94=AF=E4=B8=80=E6=80=A7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=BC=96=E7=A0=81=E7=9A=84=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/equipment/mapper/SysEquipmentMapper.java | 3 ++-
 .../equipment/service/impl/SysEquipmentServiceImpl.java      | 5 ++++-
 das/src/main/resources/mapper/SysEquipmentMapper.xml         | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
index ea6ef940..850dd1c2 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
@@ -32,7 +32,8 @@ public interface SysEquipmentMapper extends BaseMapperPlus<SysEquipment, SysEqui
     // 获取设备的动作信息
     List<BaseImptabmappingVo> getEquipmentServiceInfo(Long equipmentId);
 
-
     int queryEquipmentByCode(@Param("code")String code);
 
+    SysEquipment queryEquipmentInfoByCode(@Param("code")String code);
+
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index 4badc526..b817b378 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -83,9 +83,12 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         SysEquipment sysEquipment = new SysEquipment();
         BeanCopyUtils.copy(sysEquipmentDto, sysEquipment);
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
+        SysEquipment oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode());
         // 判断设备编码是否存在
         if (sysEquipmentMapper.queryEquipmentByCode(sysEquipment.getCode()) > 0) {
-            throw new RuntimeException("设备编码已存在");
+            if (!oldSysEquipment.getId().equals(sysEquipmentDto.getId())) {
+                throw new RuntimeException("设备编码已存在");
+            }
         }
         sysEquipment.setUpdatedTime(new Date());
         sysEquipment.setUpdatedBy(sysUserVo.getAccount());
diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml
index 819d9f30..57ea9fca 100644
--- a/das/src/main/resources/mapper/SysEquipmentMapper.xml
+++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml
@@ -137,4 +137,8 @@
         select count(1) from sys_equipment where code = #{code}
     </select>
 
+    <select id="queryEquipmentInfoByCode" resultMap="SysEquipmentMap">
+        select * from sys_equipment where code = #{code}
+    </select>
+
 </mapper>

From 7bdfa197160b01161e417d3aea81e0d3a643e18d Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Thu, 17 Oct 2024 09:40:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[301]=20=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=20=E6=B2=A1=E5=81=9A=E5=94=AF=E4=B8=80=E6=80=A7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=BC=96=E7=A0=81=E7=9A=84=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/equipment/mapper/SysEquipmentMapper.java    | 2 +-
 .../modules/equipment/service/impl/SysEquipmentServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
index 850dd1c2..989ffc85 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
@@ -34,6 +34,6 @@ public interface SysEquipmentMapper extends BaseMapperPlus<SysEquipment, SysEqui
 
     int queryEquipmentByCode(@Param("code")String code);
 
-    SysEquipment queryEquipmentInfoByCode(@Param("code")String code);
+    SysEquipmentVo queryEquipmentInfoByCode(@Param("code")String code);
 
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index b817b378..bdde52c6 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -83,7 +83,7 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         SysEquipment sysEquipment = new SysEquipment();
         BeanCopyUtils.copy(sysEquipmentDto, sysEquipment);
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
-        SysEquipment oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode());
+        SysEquipmentVo oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode());
         // 判断设备编码是否存在
         if (sysEquipmentMapper.queryEquipmentByCode(sysEquipment.getCode()) > 0) {
             if (!oldSysEquipment.getId().equals(sysEquipmentDto.getId())) {