[301]

设备编码 没做唯一性校验，可以新增相同编码的设备

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);
+
 }

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());

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>