硬件类型相关接口

ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java

@@ -1,10 +1,8 @@
 package com.ktg.common.constant;
 
-import org.omg.CORBA.PUBLIC_MEMBER;
-
 /**
  * 用户常量信息
- * 
+ *
  * @author ruoyi
  */
 public class UserConstants
@@ -57,7 +55,7 @@ public class UserConstants
 
     /** Layout组件标识 */
     public final static String LAYOUT = "Layout";
-    
+
     /** ParentView组件标识 */
     public final static String PARENT_VIEW = "ParentView";
 
@@ -104,6 +102,7 @@ public class UserConstants
     public static final String TRANSFER_CODE ="TRANSFER_CODE"; //移库
     public static final String STOCKTAKING_CODE ="STOCKTAKING_CODE"; //盘库单
     public static final String FEEDBACK_CODE ="FEEDBACK_CODE"; //报工单
+    public static final String HARDWARE_TYPE_CODE="HARDWARE_TYPE_CODE"; //硬件类型
 
     /**
      * 单据的状态类型

ktg-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
 import com.ktg.common.mapper.BaseMapperX;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
@@ -13,6 +14,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
+@Mapper
 public interface ${ClassName}Mapper extends BaseMapperX<${ClassName}>
 {
     /**

ktg-iscs/pom.xml

@@ -28,6 +28,10 @@
             <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.ktg</groupId>
+            <artifactId>ktg-system</artifactId>
+        </dependency>
 
     </dependencies>
 

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsHardwareController.java

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @Api(tags = "硬件")
 @RestController
-@RequestMapping("/is/hardware")
+@RequestMapping("/iscs/hardware")
 public class IsHardwareController extends BaseController
 {
     @Autowired

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsHardwareTypeController.java

@@ -1,18 +1,21 @@
 package com.ktg.iscs.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
 import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.obj.BeanUtils;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsHardwareType;
+import com.ktg.iscs.domain.dto.hardware.GetListDTO;
+import com.ktg.iscs.domain.vo.hardware.IsHardwareTypeVO;
 import com.ktg.iscs.service.IIsHardwareTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -28,27 +31,24 @@ import java.util.List;
  */
 @Api(tags = "硬件类型")
 @RestController
-@RequestMapping("/is/type")
+@RequestMapping("/iscs/type")
 public class IsHardwareTypeController extends BaseController
 {
     @Autowired
     private IIsHardwareTypeService isHardwareTypeService;
 
-    /**
-     * 查询硬件类型分页
-     */
-    @ApiOperation("查询硬件类型-分页")
+    @ApiOperation("查询硬件类型-列表")
     @Parameters({
-            @Parameter(name = "page", description = "Page"),
-            @Parameter(name = "sysTeam", description = "实体参数")
+            @Parameter(name = "hardwareTypeName", description = "类型名称"),
+            @Parameter(name = "enableFlag", description = "是否启用(Y-N)")
     })
-    @PreAuthorize("@ss.hasPermi('is:type:list')")
-    @GetMapping("/getIsHardwareTypePage")
-    public CommonResult<Page<IsHardwareType>> getIsHardwareTypePage(Page<IsHardwareType> page, IsHardwareType isHardwareType)
+    @GetMapping("/getIsHardwareTypeList")
+    public CommonResult<List<IsHardwareTypeVO>> list(GetListDTO getListDTO)
     {
-        Page<IsHardwareType> result = isHardwareTypeService.page(page, Wrappers.<IsHardwareType>lambdaQuery()
-                .orderByDesc(IsHardwareType::getId));
-        return CommonResult.success(result);
+        List<IsHardwareType> list = isHardwareTypeService.list(Wrappers.<IsHardwareType>lambdaQuery()
+                .like(StringUtils.isNotBlank(getListDTO.getHardwareTypeName()), IsHardwareType::getHardwareTypeName, getListDTO.getHardwareTypeName())
+                .eq(StringUtils.isNotBlank(getListDTO.getEnableFlag()), IsHardwareType::getEnableFlag, getListDTO.getEnableFlag()));
+        return CommonResult.success(BeanUtils.toBean(list, IsHardwareTypeVO.class));
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsHardwareType.java

@@ -43,7 +43,7 @@ public class IsHardwareType extends BaseBean
     private String ancestors;
 
     /** 是否启用 */
-    @Schema(description = "是否启用")
+    @Schema(description = "是否启用（Y-N）")
     @Excel(name = "是否启用")
     private String enableFlag;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/hardware/GetListDTO.java

@@ -0,0 +1,27 @@
+package com.ktg.iscs.domain.dto.hardware;
+
+import com.ktg.common.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 硬件类型对象 is_hardware_type
+ *
+ * @author cgj
+ * @date 2024-10-16
+ */
+@Data
+public class GetListDTO {
+
+    /** 硬件类型名称 */
+    @Schema(description = "硬件类型名称")
+    @Excel(name = "硬件类型名称")
+    private String hardwareTypeName;
+
+
+    /** 是否启用 */
+    @Schema(description = "是否启用（Y-N）")
+    @Excel(name = "是否启用")
+    private String enableFlag;
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/hardware/IsHardwareTypeVO.java

@@ -0,0 +1,55 @@
+package com.ktg.iscs.domain.vo.hardware;
+
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 硬件类型对象 is_hardware_type
+ *
+ * @author cgj
+ * @date 2024-10-16
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsHardwareTypeVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Schema(description = "主键id")
+    private Long id;
+
+    /** 硬件类型编码 */
+    @Schema(description = "硬件类型编码")
+    @Excel(name = "硬件类型编码")
+    private String hardwareTypeCode;
+
+    /** 硬件类型名称 */
+    @Schema(description = "硬件类型名称")
+    @Excel(name = "硬件类型名称")
+    private String hardwareTypeName;
+
+    /** 父类型ID */
+    @Schema(description = "父类型ID")
+    @Excel(name = "父类型ID")
+    private Long parentTypeId;
+
+    /** 所有父节点ID */
+    @Schema(description = "所有父节点ID")
+    @Excel(name = "所有父节点ID")
+    private String ancestors;
+
+    /** 是否启用 */
+    @Schema(description = "是否启用（Y-N）")
+    @Excel(name = "是否启用")
+    private String enableFlag;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsHardwareTypeMapper.java

@@ -2,6 +2,7 @@ package com.ktg.iscs.mapper;
 
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsHardwareType;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -11,6 +12,7 @@ import java.util.List;
  * @author cgj
  * @date 2024-10-16
  */
+@Mapper
 public interface IsHardwareTypeMapper extends BaseMapperX<IsHardwareType>
 {
     /**

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsHardwareTypeServiceImpl.java

@@ -1,12 +1,18 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.constant.UserConstants;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.common.utils.StringUtils;
+import com.ktg.iscs.domain.IsHardware;
 import com.ktg.iscs.domain.IsHardwareType;
 import com.ktg.iscs.mapper.IsHardwareTypeMapper;
+import com.ktg.iscs.service.IIsHardwareService;
 import com.ktg.iscs.service.IIsHardwareTypeService;
+import com.ktg.system.strategy.AutoCodeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +29,10 @@ public class IsHardwareTypeServiceImpl extends ServiceImpl<IsHardwareTypeMapper,
 {
     @Autowired
     private IsHardwareTypeMapper isHardwareTypeMapper;
+    @Autowired
+    private AutoCodeUtil autoCodeUtil;
+    @Autowired
+    private IIsHardwareService iIsHardwareService;
 
     /**
      * 查询硬件类型
@@ -57,6 +67,14 @@ public class IsHardwareTypeServiceImpl extends ServiceImpl<IsHardwareTypeMapper,
     @Override
     public int insertIsHardwareType(IsHardwareType isHardwareType)
     {
+        isHardwareType.setHardwareTypeCode(autoCodeUtil.genSerialCode(UserConstants.HARDWARE_TYPE_CODE,null));
+        if(isHardwareType.getParentTypeId()!= null){
+            IsHardwareType parent = getOne(Wrappers.<IsHardwareType>lambdaQuery()
+                    .eq(IsHardwareType::getId, isHardwareType.getParentTypeId()));
+            if(StringUtils.isNotNull(parent)){
+                isHardwareType.setAncestors(parent.getAncestors()+","+parent.getId());
+            }
+        }
         isHardwareType.setCreateTime(DateUtils.getNowDate());
         return isHardwareTypeMapper.insertIsHardwareType(isHardwareType);
     }
@@ -85,6 +103,13 @@ public class IsHardwareTypeServiceImpl extends ServiceImpl<IsHardwareTypeMapper,
     {
         Assert.notBlank(ids, "请选择需要删除的数据!");
         Long[] longIds = Convert.toLongArray(ids);
+        for (Long longId : longIds) {
+            List<IsHardware> list = iIsHardwareService.list(Wrappers.<IsHardware>lambdaQuery()
+                    .eq(IsHardware::getHardwareTypeId, longId));
+            if (!list.isEmpty()) {
+                Assert.isTrue(false, list.get(0).getHardwareTypeName() + "类型下已配置了设备，不能删除！");
+            }
+        }
         return isHardwareTypeMapper.deleteIsHardwareTypeByIds(longIds);
     }