From f354d032199fe8a65f0a570246d7420b515f5ec0 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Fri, 6 Sep 2024 09:19:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=BD=A6=E8=BE=86=E4=B8=AD=E6=9C=89?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E7=9A=84=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/system/EtModelController.java | 12 ++++++++++++
 .../system/EtParkingAreaController.java          | 16 ++++++++--------
 .../resources/mapper/system/EtModelMapper.xml    |  6 ++++--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java
index 7f21541..eb45a43 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java
@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.service.IAsDeviceService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +36,10 @@ public class EtModelController extends BaseController
     @Autowired
     private IEtModelService etModelService;
 
+    @Autowired
+    private IAsDeviceService asDeviceService;
+
+
     /**
      * 查询车辆型号列表
      */
@@ -99,6 +105,12 @@ public class EtModelController extends BaseController
 	@DeleteMapping("/{modelIds}")
     public AjaxResult remove(@PathVariable Long[] modelIds)
     {
+        for (Long modelId:modelIds) {
+            // 判断该型号下是否有存在车辆
+            if(asDeviceService.selectCountByModelId(modelId) > 0){
+                return AjaxResult.warn("该型号【"+modelId+"】下存在车辆，无法删除！");
+            }
+        }
         return toAjax(etModelService.deleteEtModelByModelIds(modelIds));
     }
 }
diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java
index e539284..439fd5d 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java
@@ -79,10 +79,10 @@ public class EtParkingAreaController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody EtParkingArea etParkingArea)
     {
-        if (!etParkingAreaService.checkParkingNameUnique(etParkingArea))
-        {
-            return error("新增停车区'" + etParkingArea.getParkingName() + "'失败，该停车区已存在");
-        }
+//        if (!etParkingAreaService.checkParkingNameUnique(etParkingArea))
+//        {
+//            return error("新增停车区'" + etParkingArea.getParkingName() + "'失败，该停车区已存在");
+//        }
         return toAjax(etParkingAreaService.insertEtParkingArea(etParkingArea));
     }
 
@@ -94,10 +94,10 @@ public class EtParkingAreaController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody EtParkingArea etParkingArea)
     {
-        if (!etParkingAreaService.checkParkingNameUnique(etParkingArea))
-        {
-            return error("修改停车区'" + etParkingArea.getParkingName() + "'失败，该停车区已存在");
-        }
+//        if (!etParkingAreaService.checkParkingNameUnique(etParkingArea))
+//        {
+//            return error("修改停车区'" + etParkingArea.getParkingName() + "'失败，该停车区已存在");
+//        }
         return toAjax(etParkingAreaService.updateEtParkingArea(etParkingArea));
     }
 
diff --git a/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml b/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml
index e95a8da..4c369e0 100644
--- a/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.full_endurance, m.low_battery_reminder, m.create_by, m.create_time,
         m.update_by, m.update_time, m.remark from et_model m
         left join sys_dept d on d.dept_id = m.operator
-        where 1 = 1
+        where del_flag != 2
         <if test="model != null  and model != ''"> and m.model = #{model}</if>
         <if test="brand != null  and brand != ''"> and m.brand = #{brand}</if>
         <if test="operator != null  and operator != ''"> and m.operator = #{operator}</if>
@@ -107,7 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEtModelByModelIds" parameterType="String">
-        delete from et_model where model_id in
+        UPDATE et_model
+        SET del_flag = 2
+        WHERE model_id IN
         <foreach item="modelId" collection="array" open="(" separator="," close=")">
             #{modelId}
         </foreach>