处理isc_lock_type业务逻辑

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -36,6 +36,7 @@ public interface GlobalErrorCodeConstants {
     ErrorCode REPEATED_REQUESTS = new ErrorCode(900, "重复请求，请稍后重试"); // 重复请求
     ErrorCode DEMO_DENY = new ErrorCode(901, "演示模式，禁止写操作");
 
+    ErrorCode ASSERT_ERROR = new ErrorCode(902, "断言异常");
     ErrorCode UNKNOWN = new ErrorCode(999, "未知错误");
 
 }

yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java

@@ -107,9 +107,21 @@ public class GlobalExceptionHandler {
         if (ex instanceof AccessDeniedException) {
             return accessDeniedExceptionHandler(request, (AccessDeniedException) ex);
         }
+        if (ex instanceof IllegalArgumentException) {
+            return assertExceptionHandler((IllegalArgumentException) ex);
+        }
         return defaultExceptionHandler(request, ex);
     }
 
+    /**
+     * 处理 assert 断言判断异常
+     */
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    public CommonResult<?> assertExceptionHandler(IllegalArgumentException ex) {
+        log.warn("[assertServletRequestParameterExceptionHandler]", ex);
+        return CommonResult.error(ASSERT_ERROR.getCode(), ex.getMessage());
+    }
+
     /**
      * 处理 SpringMVC 请求参数缺失
      *

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/locktype/LockTypeController.java

@@ -1,95 +1,93 @@
-package cn.iocoder.yudao.module.iscs.controller.admin.locktype;
-
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
-import cn.iocoder.yudao.module.iscs.service.locktype.LockTypeService;
-
-@Tag(name = "管理后台 - 挂锁类型")
-@RestController
-@RequestMapping("/iscs/lock-type")
-@Validated
-public class LockTypeController {
-
-    @Resource
-    private LockTypeService lockTypeService;
-
-    @PostMapping("/insertLockType")
-    @Operation(summary = "创建挂锁类型")
-    @PreAuthorize("@ss.hasPermission('iscs:lock-type:create')")
-    public CommonResult<Long> insertLockType(@Valid @RequestBody LockTypeSaveReqVO createReqVO) {
-        return success(lockTypeService.createLockType(createReqVO));
-    }
-
-    @PutMapping("/updateLockType")
-    @Operation(summary = "更新挂锁类型")
-    @PreAuthorize("@ss.hasPermission('iscs:lock-type:update')")
-    public CommonResult<Boolean> updateLockType(@Valid @RequestBody LockTypeSaveReqVO updateReqVO) {
-        lockTypeService.updateLockType(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/deleteLockTypeList")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除挂锁类型")
-                @PreAuthorize("@ss.hasPermission('iscs:lock-type:delete')")
-    public CommonResult<Boolean> deleteLockTypeList(@RequestParam("ids") List<Long> ids) {
-        lockTypeService.deleteLockTypeListByIds(ids);
-        return success(true);
-    }
-
-    @GetMapping("/selectLockTypeById")
-    @Operation(summary = "获得挂锁类型")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('iscs:lock-type:query')")
-    public CommonResult<LockTypeRespVO> selectLockTypeById(@RequestParam("id") Long id) {
-        LockTypeDO lockType = lockTypeService.getLockType(id);
-        return success(BeanUtils.toBean(lockType, LockTypeRespVO.class));
-    }
-
-    @GetMapping("/getLockTypePage")
-    @Operation(summary = "获得挂锁类型分页")
-    @PreAuthorize("@ss.hasPermission('iscs:lock-type:query')")
-    public CommonResult<PageResult<LockTypeRespVO>> getLockTypePage(@Valid LockTypePageReqVO pageReqVO) {
-        PageResult<LockTypeDO> pageResult = lockTypeService.getLockTypePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, LockTypeRespVO.class));
-    }
-
-    @GetMapping("/exportLockTypeExcel")
-    @Operation(summary = "导出挂锁类型 Excel")
-    @PreAuthorize("@ss.hasPermission('iscs:lock-type:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportLockTypeExcel(@Valid LockTypePageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<LockTypeDO> list = lockTypeService.getLockTypePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "挂锁类型.xls", "数据", LockTypeRespVO.class,
-                        BeanUtils.toBean(list, LockTypeRespVO.class));
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.controller.admin.locktype;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
+import cn.iocoder.yudao.module.iscs.service.locktype.LockTypeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 挂锁类型")
+@RestController
+@RequestMapping("/iscs/lock-type")
+@Validated
+public class LockTypeController {
+
+    @Resource
+    private LockTypeService lockTypeService;
+
+    @PostMapping("/insertLockType")
+    @Operation(summary = "创建挂锁类型")
+    @PreAuthorize("@ss.hasPermission('iscs:lock-type:create')")
+    public CommonResult<Long> insertLockType(@Valid @RequestBody LockTypeSaveReqVO createReqVO) {
+        return success(lockTypeService.createLockType(createReqVO));
+    }
+
+    @PutMapping("/updateLockType")
+    @Operation(summary = "更新挂锁类型")
+    @PreAuthorize("@ss.hasPermission('iscs:lock-type:update')")
+    public CommonResult<Boolean> updateLockType(@Valid @RequestBody LockTypeSaveReqVO updateReqVO) {
+        lockTypeService.updateLockType(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/deleteLockTypeList")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除挂锁类型")
+                @PreAuthorize("@ss.hasPermission('iscs:lock-type:delete')")
+    public CommonResult<Boolean> deleteLockTypeList(@RequestParam("ids") List<Long> ids) {
+        lockTypeService.deleteLockTypeListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/selectLockTypeById")
+    @Operation(summary = "获得挂锁类型")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iscs:lock-type:query')")
+    public CommonResult<LockTypeRespVO> selectLockTypeById(@RequestParam("id") Long id) {
+        LockTypeDO lockType = lockTypeService.getLockType(id);
+        return success(BeanUtils.toBean(lockType, LockTypeRespVO.class));
+    }
+
+    @GetMapping("/getLockTypePage")
+    @Operation(summary = "获得挂锁类型分页")
+    @PreAuthorize("@ss.hasPermission('iscs:lock-type:query')")
+    public CommonResult<PageResult<LockTypeRespVO>> getLockTypePage(@Valid LockTypePageReqVO pageReqVO) {
+        PageResult<LockTypeRespVO> pageResult = lockTypeService.getLockTypePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, LockTypeRespVO.class));
+    }
+
+    @GetMapping("/exportLockTypeExcel")
+    @Operation(summary = "导出挂锁类型 Excel")
+    @PreAuthorize("@ss.hasPermission('iscs:lock-type:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportLockTypeExcel(@Valid LockTypePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<LockTypeRespVO> list = lockTypeService.getLockTypePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "挂锁类型.xls", "数据", LockTypeRespVO.class,
+                        BeanUtils.toBean(list, LockTypeRespVO.class));
+    }
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialstype/vo/MaterialsTypeSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.materialstype.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 物资类型新增/修改 Request VO")
 @Data
@@ -28,7 +28,6 @@ public class MaterialsTypeSaveReqVO {
     private String ancestors;
 
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否启用不能为空")
     private String enableFlag;
 
     @Schema(description = "可用寿命")
@@ -61,4 +60,4 @@ public class MaterialsTypeSaveReqVO {
     @Schema(description = "规格属性项")
     private String propertyIds;
 
-}
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/locktype/LockTypeMapper.java

@@ -1,13 +1,14 @@
 package cn.iocoder.yudao.module.iscs.dal.mysql.locktype;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 挂锁类型 Mapper
@@ -33,4 +34,6 @@ public interface LockTypeMapper extends BaseMapperX<LockTypeDO> {
                 .orderByDesc(LockTypeDO::getId));
     }
 
-}
+    Page<LockTypeRespVO> getLockTypePage(Page page, @Param(value = "vo") LockTypePageReqVO vo);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/locktype/LockTypeService.java

@@ -1,63 +1,65 @@
-package cn.iocoder.yudao.module.iscs.service.locktype;
-
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 挂锁类型 Service 接口
- *
- * @author 芋道源码
- */
-public interface LockTypeService extends IService<LockTypeDO> {
-
-    /**
-     * 创建挂锁类型
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createLockType(@Valid LockTypeSaveReqVO createReqVO);
-
-    /**
-     * 更新挂锁类型
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateLockType(@Valid LockTypeSaveReqVO updateReqVO);
-
-    /**
-     * 删除挂锁类型
-     *
-     * @param id 编号
-     */
-    void deleteLockType(Long id);
-
-    /**
-    * 批量删除挂锁类型
-    *
-    * @param ids 编号
-    */
-    void deleteLockTypeListByIds(List<Long> ids);
-
-    /**
-     * 获得挂锁类型
-     *
-     * @param id 编号
-     * @return 挂锁类型
-     */
-    LockTypeDO getLockType(Long id);
-
-    /**
-     * 获得挂锁类型分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 挂锁类型分页
-     */
-    PageResult<LockTypeDO> getLockTypePage(LockTypePageReqVO pageReqVO);
-
-}
+package cn.iocoder.yudao.module.iscs.service.locktype;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 挂锁类型 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface LockTypeService extends IService<LockTypeDO> {
+
+    /**
+     * 创建挂锁类型
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createLockType(@Valid LockTypeSaveReqVO createReqVO);
+
+    /**
+     * 更新挂锁类型
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateLockType(@Valid LockTypeSaveReqVO updateReqVO);
+
+    /**
+     * 删除挂锁类型
+     *
+     * @param id 编号
+     */
+    void deleteLockType(Long id);
+
+    /**
+    * 批量删除挂锁类型
+    *
+    * @param ids 编号
+    */
+    void deleteLockTypeListByIds(List<Long> ids);
+
+    /**
+     * 获得挂锁类型
+     *
+     * @param id 编号
+     * @return 挂锁类型
+     */
+    LockTypeDO getLockType(Long id);
+
+    /**
+     * 获得挂锁类型分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 挂锁类型分页
+     */
+    PageResult<LockTypeRespVO> getLockTypePage(LockTypePageReqVO pageReqVO);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/locktype/LockTypeServiceImpl.java

@@ -1,94 +1,120 @@
-package cn.iocoder.yudao.module.iscs.service.locktype;
-
-import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-import cn.iocoder.yudao.module.iscs.dal.mysql.locktype.LockTypeMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
-import static cn.iocoder.yudao.module.iscs.enums.ErrorCodeConstants.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 挂锁类型 Service 实现类
- *
- * @author 芋道源码
- */
-@Service
-@Validated
-public class LockTypeServiceImpl extends ServiceImpl<LockTypeMapper, LockTypeDO> implements LockTypeService {
-
-    @Resource
-    private LockTypeMapper lockTypeMapper;
-
-    @Override
-    public Long createLockType(LockTypeSaveReqVO createReqVO) {
-        // 插入
-        LockTypeDO lockType = BeanUtils.toBean(createReqVO, LockTypeDO.class);
-        lockTypeMapper.insert(lockType);
-
-        // 返回
-        return lockType.getId();
-    }
-
-    @Override
-    public void updateLockType(LockTypeSaveReqVO updateReqVO) {
-        // 校验存在
-        validateLockTypeExists(updateReqVO.getId());
-        // 更新
-        LockTypeDO updateObj = BeanUtils.toBean(updateReqVO, LockTypeDO.class);
-        lockTypeMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteLockType(Long id) {
-        // 校验存在
-        validateLockTypeExists(id);
-        // 删除
-        lockTypeMapper.deleteById(id);
-    }
-
-    @Override
-        public void deleteLockTypeListByIds(List<Long> ids) {
-        // 校验存在
-        validateLockTypeExists(ids);
-        // 删除
-        lockTypeMapper.deleteByIds(ids);
-        }
-
-    private void validateLockTypeExists(List<Long> ids) {
-        List<LockTypeDO> list = lockTypeMapper.selectByIds(ids);
-        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
-            throw exception(LOCK_TYPE_NOT_EXISTS);
-        }
-    }
-
-    private void validateLockTypeExists(Long id) {
-        if (lockTypeMapper.selectById(id) == null) {
-            throw exception(LOCK_TYPE_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public LockTypeDO getLockType(Long id) {
-        return lockTypeMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<LockTypeDO> getLockTypePage(LockTypePageReqVO pageReqVO) {
-        return lockTypeMapper.selectPage(pageReqVO);
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.service.locktype;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.isolationpoint.IsolationPointDO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.locktype.LockTypeDO;
+import cn.iocoder.yudao.module.iscs.dal.mysql.locktype.LockTypeMapper;
+import cn.iocoder.yudao.module.iscs.service.isolationpoint.IsolationPointService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.iscs.enums.ErrorCodeConstants.LOCK_TYPE_NOT_EXISTS;
+
+/**
+ * 挂锁类型 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class LockTypeServiceImpl extends ServiceImpl<LockTypeMapper, LockTypeDO> implements LockTypeService {
+
+    @Resource
+    private LockTypeMapper lockTypeMapper;
+    @Resource
+    private IsolationPointService isolationPointService;
+
+    @Override
+    public Long createLockType(LockTypeSaveReqVO createReqVO) {
+        // 1.检查挂锁类型名称是否重复
+        List<LockTypeDO> list = list(Wrappers.<LockTypeDO>lambdaQuery()
+                .eq(LockTypeDO::getLockTypeName, createReqVO.getLockTypeName()));
+        Assert.isFalse(!list.isEmpty(), "该挂锁类型名称已被使用!");
+        // 插入
+        LockTypeDO lockType = BeanUtils.toBean(createReqVO, LockTypeDO.class);
+        lockTypeMapper.insert(lockType);
+
+        // 返回
+        return lockType.getId();
+    }
+
+    @Override
+    public void updateLockType(LockTypeSaveReqVO updateReqVO) {
+        // 1.检查挂锁类型名称是否重复
+        List<LockTypeDO> list = list(Wrappers.<LockTypeDO>lambdaQuery()
+                .eq(LockTypeDO::getLockTypeName, updateReqVO.getLockTypeName())
+                .ne(LockTypeDO::getId, updateReqVO.getId()));
+        Assert.isFalse(!list.isEmpty(), "该挂锁类型名称已被使用!");
+        // 校验存在
+        validateLockTypeExists(updateReqVO.getId());
+        // 更新
+        LockTypeDO updateObj = BeanUtils.toBean(updateReqVO, LockTypeDO.class);
+        lockTypeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteLockType(Long id) {
+        // 校验存在
+        validateLockTypeExists(id);
+        // 删除
+        lockTypeMapper.deleteById(id);
+    }
+
+    @Override
+        public void deleteLockTypeListByIds(List<Long> ids) {
+        Assert.isFalse(ids.isEmpty(), "请选择需要删除的数据!");
+        // 判断下面有没有子类，有则不能删除
+        List<LockTypeDO> lockTypeList = list(Wrappers.<LockTypeDO>lambdaQuery().in(LockTypeDO::getParentTypeId, ids));
+        Assert.isTrue(lockTypeList.isEmpty(), "选中的类别下存在子类，不可删除！");
+        // 判断有没有点位使用该类别，有的话不能删
+        List<IsolationPointDO> pointList = isolationPointService.list(Wrappers.<IsolationPointDO>lambdaQuery()
+                .in(IsolationPointDO::getLockTypeId, ids));
+        Assert.isTrue(pointList.isEmpty(), "选中的类别下有被隔离点正在使用的，不可删除！");
+        // 校验存在
+        validateLockTypeExists(ids);
+        // 删除
+        lockTypeMapper.deleteByIds(ids);
+        }
+
+    private void validateLockTypeExists(List<Long> ids) {
+        List<LockTypeDO> list = lockTypeMapper.selectByIds(ids);
+        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
+            throw exception(LOCK_TYPE_NOT_EXISTS);
+        }
+    }
+
+    private void validateLockTypeExists(Long id) {
+        if (lockTypeMapper.selectById(id) == null) {
+            throw exception(LOCK_TYPE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public LockTypeDO getLockType(Long id) {
+        return lockTypeMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<LockTypeRespVO> getLockTypePage(LockTypePageReqVO pageReqVO) {
+        Page<LockTypeDO> page = new Page<LockTypeDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
+        Page<LockTypeRespVO> lockTypePage = lockTypeMapper.getLockTypePage(page, pageReqVO);
+        PageResult<LockTypeRespVO> lockTypeDOPageResult = new PageResult<>();
+        lockTypeDOPageResult.setList(lockTypePage.getRecords());
+        lockTypeDOPageResult.setTotal(lockTypePage.getTotal());
+        return lockTypeDOPageResult;
+    }
+
+}

yudao-module-iscs/src/main/resources/mapper/LockTypeMapper.xml

@@ -9,4 +9,23 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-</mapper>
+    <select id="getLockTypePage"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.locktype.vo.LockTypeRespVO">
+        SELECT
+        l.*,
+        h.hardware_type_name
+        FROM
+        isc_lock_type l
+        LEFT JOIN isc_hardware_type h ON l.id = h.id
+        <where>
+            <if test="vo.lockTypeCode != null and vo.lockTypeCode.trim != ''">
+                and l.lock_type_code like concat('%',#{vo.lockTypeCode},'%')
+            </if>
+            <if test="vo.lockTypeName != null and vo.lockTypeName.trim != ''">
+                and l.lock_type_name like concat('%',#{vo.lockTypeName},'%')
+            </if>
+        </where>
+        ORDER BY
+        l.id asc
+    </select>
+</mapper>