From 652f6857fa5536660fb756db5345b6df9ba2807f Mon Sep 17 00:00:00 2001
From: nmy <849173236@qq.com>
Date: Mon, 4 Dec 2023 19:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/zlpt/equip/controller/TypeInfoController.java  | 9 +++++++++
 .../java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java | 2 ++
 .../zlpt/equip/service/impl/TypeInfoServiceImpl.java     | 3 +++
 .../src/main/resources/mapper/TypeInfoMapper.xml         | 5 ++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java
index 17af875..47d38b9 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java
@@ -102,6 +102,15 @@ public class TypeInfoController extends BaseController
         return toAjax(typeInfoService.deleteTypeInfoByTypeIds(typeIds));
     }
 
+    /**
+     * 删除设备类型
+     */
+    @DeleteMapping("/remove/{typeId}")
+    public AjaxResult remove(@PathVariable Long typeId)
+    {
+        return toAjax(typeInfoService.deleteTypeInfoByTypeId(typeId));
+    }
+
     /**
      * 获取设备类型树结构
      * @return
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java
index 53991e4..2e9e3b0 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java
@@ -58,4 +58,6 @@ public interface TypeInfoMapper
      * @return 结果
      */
     public int deleteTypeInfoByTypeIds(Long[] typeIds);
+
+    int selectCountByTypeId(Long typeId);
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java
index 341772c..045da8a 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java
@@ -101,6 +101,9 @@ public class TypeInfoServiceImpl implements ITypeInfoService
     @Override
     public int deleteTypeInfoByTypeId(Long typeId)
     {
+        if(typeInfoMapper.selectCountByTypeId(typeId)>0){
+            return 0;
+        }
         return typeInfoMapper.deleteTypeInfoByTypeId(typeId);
     }
 
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/TypeInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/TypeInfoMapper.xml
index eb3ec0d..ced8cbb 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/TypeInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/TypeInfoMapper.xml
@@ -38,7 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTypeInfoVo"/>
         where type_id = #{typeId}
     </select>
-        
+    <select id="selectCountByTypeId" resultType="java.lang.Integer">
+        select COUNT(*) from ma_type_info where parent_id = #{typeId}
+    </select>
+
     <insert id="insertTypeInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.TypeInfo">
         insert into ma_type_info
         <trim prefix="(" suffix=")" suffixOverrides=",">