Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/TypeInfoController.java

@@ -106,6 +106,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

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

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java

@@ -99,6 +99,9 @@ public class TypeInfoServiceImpl implements ITypeInfoService
     @Override
     public int deleteTypeInfoByTypeId(Long typeId)
     {
+        if(typeInfoMapper.selectCountByTypeId(typeId)>0){
+            return 0;
+        }
         return typeInfoMapper.deleteTypeInfoByTypeId(typeId);
     }
 

zlpt-modules/zlpt-equip/src/main/resources/mapper/TypeInfoMapper.xml

@@ -38,6 +38,9 @@ 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