修改挂锁的查询

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

@@ -29,6 +29,7 @@ public class HardwareApiController extends BaseController
     @Autowired
     private HardwareApiService hardwareApiService;
 
+    // ----------------------------------作业票取还钥匙-------------------------------------------------------
     @ApiOperation("取出钥匙")
     @Log(title = "取出钥匙", businessType = BusinessType.UPDATE)
     @PostMapping("/updateTakeOutKey")
@@ -45,6 +46,8 @@ public class HardwareApiController extends BaseController
         return CommonResult.success(hardwareApiService.updateReturnKey(dto));
     }
 
+
+    // ----------------------------------作业票取还挂锁-------------------------------------------------------
     @ApiOperation("取出挂锁时更新数据")
     @Log(title = "取出挂锁时更新数据", businessType = BusinessType.UPDATE)
     @PostMapping("/updateTicketLockTake")
@@ -78,7 +81,7 @@ public class HardwareApiController extends BaseController
     }
 
 
-
+    // ----------------------------------作业票取还辅件-------------------------------------------------------
     @ApiOperation("取出辅件时更新数据")
     @Log(title = "取出辅件时更新数据", businessType = BusinessType.UPDATE)
     @PostMapping("/updateLocksetTake")
@@ -103,7 +106,7 @@ public class HardwareApiController extends BaseController
         return CommonResult.success(hardwareApiService.updateLocksetReturn(dto));
     }
 
-
+    // ----------------------------------作业票及作业票的相关数据查询-------------------------------------------------------
     @ApiOperation("获取作业票和关联数据")
     @Parameter(name = "ticketId", description = "ticketId")
     @GetMapping(value = "/selectTicketDetailById")

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

@@ -1,6 +1,5 @@
 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;
@@ -8,12 +7,12 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsLockType;
+import com.ktg.iscs.domain.vo.lockType.IsLockTypeVO;
 import com.ktg.iscs.service.IIsLockTypeService;
 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.*;
@@ -27,7 +26,7 @@ import java.util.List;
  * @author cgj
  * @date 2024-11-12
  */
-@Api(tags = "锁具类型")
+@Api(tags = "挂锁类型")
 @RestController
 @RequestMapping("/iscs/lockType")
 public class IsLockTypeController extends BaseController
@@ -45,14 +44,14 @@ public class IsLockTypeController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:type:list')")
     @GetMapping("/getIsLockTypePage")
-    public CommonResult<Page<IsLockType>> getIsLockTypePage(Page<IsLockType> page, IsLockType isLockType)
+    public CommonResult<Page<IsLockTypeVO>> getIsLockTypePage(Page<IsLockType> page, IsLockType isLockType)
     {
-        Page<IsLockType> result = isLockTypeService.page(page, Wrappers.<IsLockType>lambdaQuery()
+        /*Page<IsLockType> result = isLockTypeService.page(page, Wrappers.<IsLockType>lambdaQuery()
                 .like(StringUtils.isNotBlank(isLockType.getLockTypeCode()), IsLockType::getLockTypeCode, isLockType.getLockTypeCode())
                 .like(StringUtils.isNotBlank(isLockType.getLockTypeName()), IsLockType::getLockTypeName, isLockType.getLockTypeName())
                 .like(StringUtils.isNotBlank(isLockType.getLockTypeDescription()), IsLockType::getLockTypeDescription, isLockType.getLockTypeDescription())
-                .orderByDesc(IsLockType::getLockTypeId));
-        return CommonResult.success(result);
+                .orderByDesc(IsLockType::getLockTypeId));*/
+        return CommonResult.success(isLockTypeService.getIsLockTypePage(page, isLockType));
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/lockType/IsLockTypeVO.java

@@ -0,0 +1,62 @@
+package com.ktg.iscs.domain.vo.lockType;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物资类型对象 is_lock_type
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsLockTypeVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "锁具类型ID")
+    @TableId(type = IdType.AUTO)
+    private Long lockTypeId;
+
+    @ApiModelProperty(value = "锁具类型编码")
+    @Excel(name = "锁具类型编码")
+    private String lockTypeCode;
+
+    @ApiModelProperty(value = "锁具类型名称")
+    @Excel(name = "锁具类型名称")
+    private String lockTypeName;
+
+    @ApiModelProperty(value = "锁具类型描述")
+    @Excel(name = "锁具类型描述")
+    private String lockTypeDescription;
+
+    @ApiModelProperty(value = "锁具类型图标")
+    @Excel(name = "锁具类型图标")
+    private String lockTypeIcon;
+
+    @ApiModelProperty(value = "锁具类型图片")
+    @Excel(name = "锁具类型图片")
+    private String lockTypeImg;
+
+    @ApiModelProperty(value = "硬件类型ID")
+    private Long hardwareTypeId;
+
+    @ApiModelProperty(value = "硬件类型Name")
+    private String hardwareTypeName;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty(value = "父类型ID")
+    private Long parentTypeId;
+
+    @ApiModelProperty(value = "所有父节点ID")
+    private String ancestors;
+
+}

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

@@ -1,8 +1,11 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsLockType;
+import com.ktg.iscs.domain.vo.lockType.IsLockTypeVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +65,6 @@ public interface IsLockTypeMapper extends BaseMapperX<IsLockType>
      * @return 结果
      */
     int deleteIsLockTypeByLockTypeIds(Long[] lockTypeIds);
+
+    Page<IsLockTypeVO> getIsLockTypePage(Page<IsLockType> page, @Param(value = "isLockType") IsLockType isLockType);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsLockTypeService.java

@@ -1,7 +1,9 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsLockType;
+import com.ktg.iscs.domain.vo.lockType.IsLockTypeVO;
 
 import java.util.List;
 
@@ -60,4 +62,7 @@ public interface IIsLockTypeService extends IService<IsLockType>
      * @return 结果
      */
     int deleteIsLockTypeByLockTypeId(Long lockTypeId);
+
+    Page<IsLockTypeVO> getIsLockTypePage(Page<IsLockType> page, IsLockType isLockType);
+
 }

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

@@ -72,7 +72,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                 .eq(IsJobTicketKey::getTicketType, "0"));
         // 2.根据作业票判断到了哪一阶段了，如果上锁数据中这两个数据有空的，那肯定是上锁阶段还没有完成
         if (jobTicketKey.getCollectTime() == null || jobTicketKey.getGiveBackTime() == null) {
-            // 3.上锁阶段
+            // 3.上锁阶段取钥匙
             iIsJobTicketKeyService.update(Wrappers.<IsJobTicketKey>lambdaUpdate()
                     .eq(IsJobTicketKey::getTicketId, dto.getTicketId())
                     .eq(IsJobTicketKey::getTicketType, "0")
@@ -82,7 +82,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                     .set(IsJobTicketKey::getKeyStatus, KeyStatusEnum.TAKED.status));
 
         } else {
-            // 3.1解锁阶段
+            // 3.1解锁阶段取钥匙
             iIsJobTicketKeyService.update(Wrappers.<IsJobTicketKey>lambdaUpdate()
                     .eq(IsJobTicketKey::getTicketId, dto.getTicketId())
                     .eq(IsJobTicketKey::getTicketType, "1")
@@ -117,7 +117,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                 .eq(IsJobTicketKey::getTicketType, "0"));
         // 2.根据作业票判断到了哪一阶段了，如果上锁数据中这两个数据有空的，那肯定是上锁阶段还没有完成
         if (jobTicketKey.getCollectTime() == null || jobTicketKey.getGiveBackTime() == null) {
-            // 3.上锁阶段
+            // 3.上锁阶段还钥匙
             iIsJobTicketKeyService.update(Wrappers.<IsJobTicketKey>lambdaUpdate()
                     .eq(IsJobTicketKey::getTicketId, dto.getTicketId())
                     .eq(IsJobTicketKey::getTicketType, "0")
@@ -127,7 +127,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                     .set(IsJobTicketKey::getKeyStatus, KeyStatusEnum.RETURNED.status));
 
         } else {
-            // 3.1解锁阶段
+            // 3.1解锁阶段还钥匙
             iIsJobTicketKeyService.update(Wrappers.<IsJobTicketKey>lambdaUpdate()
                     .eq(IsJobTicketKey::getTicketId, dto.getTicketId())
                     .eq(IsJobTicketKey::getTicketType, "1")

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

@@ -2,11 +2,13 @@ package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.iscs.domain.IsIsolationPoint;
 import com.ktg.iscs.domain.IsLockType;
+import com.ktg.iscs.domain.vo.lockType.IsLockTypeVO;
 import com.ktg.iscs.mapper.IsLockTypeMapper;
 import com.ktg.iscs.service.IIsIsolationPointService;
 import com.ktg.iscs.service.IIsLockTypeService;
@@ -111,4 +113,9 @@ public class IsLockTypeServiceImpl extends ServiceImpl<IsLockTypeMapper, IsLockT
     {
         return isLockTypeMapper.deleteIsLockTypeByLockTypeId(lockTypeId);
     }
+
+    @Override
+    public Page<IsLockTypeVO> getIsLockTypePage(Page<IsLockType> page, IsLockType isLockType) {
+        return isLockTypeMapper.getIsLockTypePage(page, isLockType);
+    }
 }

ktg-iscs/src/main/resources/mapper/IsLockTypeMapper.xml

@@ -110,4 +110,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{lockTypeId}
         </foreach>
     </delete>
+
+    <select id="getIsLockTypePage" resultType="com.ktg.iscs.domain.vo.lockType.IsLockTypeVO">
+        SELECT
+            l.*,
+            h.hardware_type_name
+        FROM
+            is_lock_type l
+            LEFT JOIN is_hardware_type h ON l.hardware_type_id = h.id
+        <where>
+            <if test="isLockType.lockTypeCode != null and isLockType.lockTypeCode.trim != ''">
+                and l.lock_type_code like concat('%',#{isLockType.lock_type_code},'%')
+            </if>
+            <if test="isLockType.lockTypeName != null and isLockType.lockTypeName.trim != ''">
+                and l.lock_type_namee like concat('%',#{isLockType.lockTypeName},'%')
+            </if>
+        </where>
+        ORDER BY
+        l.lock_type_id DESC
+    </select>
+
+
 </mapper>