对接修改

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

@@ -80,6 +80,14 @@ public class HardwareApiController extends BaseController
         return CommonResult.success(hardwareApiService.updateTicketLockStatus(dto));
     }
 
+    @ApiOperation("批量更新作业票下隔离点的上锁状况")
+    @Log(title = "批量更新作业票下隔离点的上锁状况", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateLockPointBatch")
+    public CommonResult<Boolean> updateLockPointBatch(@RequestBody @Parameter(name = "dtos", description = "修改数据类,放到body") List<LockPointBatchDTO> list)
+    {
+        return CommonResult.success(hardwareApiService.updateLockPointBatch(list));
+    }
+
 
     // ----------------------------------作业票取还辅件-------------------------------------------------------
     @ApiOperation("取出辅件时更新数据")

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsKeyController.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,6 +7,7 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsKey;
+import com.ktg.iscs.domain.vo.key.IsKeyVO;
 import com.ktg.iscs.service.IIsKeyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,10 +44,12 @@ public class IsKeyController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:key:list')")
     @GetMapping("/getIsKeyPage")
-    public CommonResult<Page<IsKey>> getIsKeyPage(Page<IsKey> page, IsKey isKey)
+    public CommonResult<Page<IsKeyVO>> getIsKeyPage(Page<IsKey> page, IsKey isKey)
     {
-        Page<IsKey> result = isKeyService.page(page, Wrappers.<IsKey>lambdaQuery()
-                .orderByDesc(IsKey::getKeyId));
+        // Page<IsKey> result = isKeyService.page(page, Wrappers.<IsKey>lambdaQuery()
+        //         .orderByDesc(IsKey::getKeyId));
+
+        Page<IsKeyVO> result = isKeyService.getIsKeyPage(page, isKey);
         return CommonResult.success(result);
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLockController.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,6 +7,7 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsLock;
+import com.ktg.iscs.domain.vo.lock.IsLockVO;
 import com.ktg.iscs.service.IIsLockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,10 +44,11 @@ public class IsLockController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:lock:list')")
     @GetMapping("/getIsLockPage")
-    public CommonResult<Page<IsLock>> getIsLockPage(Page<IsLock> page, IsLock isLock)
+    public CommonResult<Page<IsLockVO>> getIsLockPage(Page<IsLock> page, IsLock isLock)
     {
-        Page<IsLock> result = isLockService.page(page, Wrappers.<IsLock>lambdaQuery()
-                .orderByDesc(IsLock::getLockId));
+        // Page<IsLock> result = isLockService.page(page, Wrappers.<IsLock>lambdaQuery()
+        //         .orderByDesc(IsLock::getLockId));
+        Page<IsLockVO> result = isLockService.getIsLockPage(page, isLock);
         return CommonResult.success(result);
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLocksetController.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,6 +7,7 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsLockset;
+import com.ktg.iscs.domain.vo.lockset.IsLocksetVO;
 import com.ktg.iscs.service.IIsLocksetService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,10 +44,13 @@ public class IsLocksetController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:lockset:list')")
     @GetMapping("/getIsLocksetPage")
-    public CommonResult<Page<IsLockset>> getIsLocksetPage(Page<IsLockset> page, IsLockset isLockset)
+    public CommonResult<Page<IsLocksetVO>> getIsLocksetPage(Page<IsLockset> page, IsLockset isLockset)
     {
-        Page<IsLockset> result = isLocksetService.page(page, Wrappers.<IsLockset>lambdaQuery()
-                .orderByDesc(IsLockset::getLocksetId));
+       // Page<IsLockset> result = isLocksetService.page(page, Wrappers.<IsLockset>lambdaQuery()
+       //         .orderByDesc(IsLockset::getLocksetId));
+        Page<IsLocksetVO> result = isLocksetService.getIsLocksetPage(page, isLockset);
+
+
         return CommonResult.success(result);
     }
 

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLocksetTypeController.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,6 +7,7 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsLocksetType;
+import com.ktg.iscs.domain.vo.locksetType.IsLocksetTypeVO;
 import com.ktg.iscs.service.IIsLocksetTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,10 +44,11 @@ public class IsLocksetTypeController extends BaseController
     })
     @PreAuthorize("@ss.hasPermi('iscs:type:list')")
     @GetMapping("/getIsLocksetTypePage")
-    public CommonResult<Page<IsLocksetType>> getIsLocksetTypePage(Page<IsLocksetType> page, IsLocksetType isLocksetType)
+    public CommonResult<Page<IsLocksetTypeVO>> getIsLocksetTypePage(Page<IsLocksetType> page, IsLocksetType isLocksetType)
     {
-        Page<IsLocksetType> result = isLocksetTypeService.page(page, Wrappers.<IsLocksetType>lambdaQuery()
-                .orderByDesc(IsLocksetType::getLocksetTypeId));
+        // Page<IsLocksetType> result = isLocksetTypeService.page(page, Wrappers.<IsLocksetType>lambdaQuery()
+        //         .orderByDesc(IsLocksetType::getLocksetTypeId));
+        Page<IsLocksetTypeVO> result = isLocksetTypeService.getIsLocksetTypePage(page, isLocksetType);
         return CommonResult.success(result);
     }
 

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

@@ -50,7 +50,7 @@ public class IsJobTicketPoints extends BaseBean
     private Long pointId;
 
     /** 隔离点状态 */
-    @ApiModelProperty(value = "隔离点状态")
+    @ApiModelProperty(value = "隔离点状态(0-未上锁 1-已上锁 2-已解锁)")
     @Excel(name = "隔离点状态")
     private String pointStatus;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/hardwareApi/LockPointBatchDTO.java

@@ -0,0 +1,33 @@
+package com.ktg.iscs.domain.dto.hardwareApi;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * UpdateTicketLockDTO
+ *
+ * @author cgj
+ * @date 2024-10-16
+ */
+@Data
+public class LockPointBatchDTO {
+
+    @ApiModelProperty(value = "作业票ID")
+    private Long ticketId;
+
+    @ApiModelProperty(value = "挂锁NFC")
+    private String lockNfc;
+
+    @ApiModelProperty(value = "隔离点nfc")
+    private String pointNfc;
+
+    @ApiModelProperty(value = "keyNfc")
+    private String keyNfc;
+
+    @ApiModelProperty(value = "任务目标：0—挂锁；1—解锁")
+    private Integer target;
+
+    @ApiModelProperty(value = "任务当前状态：0—挂锁；1—解锁；2-无操作")
+    private Integer status;
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/enums/PointStatusEnum.java

@@ -0,0 +1,23 @@
+package com.ktg.iscs.domain.enums;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum PointStatusEnum {
+    /**
+     * 上锁人包含0-5，共锁人包含0、4、5
+     */
+    UNLOCK(0, "未上锁"),
+    LOCKED(1, "已上锁"),
+    REMOVE_LOCK(2, "已解锁");
+
+    /**
+     * 状态编号
+     */
+    public final Integer status;
+
+    /**
+     * 描述
+     */
+    public final String desc;
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/key/IsKeyVO.java

@@ -0,0 +1,54 @@
+package com.ktg.iscs.domain.vo.key;
+
+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_key
+ *
+ * @author cgj
+ * @date 2024-11-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsKeyVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "钥匙ID")
+    @TableId(type = IdType.AUTO)
+    private Long keyId;
+
+    @ApiModelProperty(value = "钥匙编码")
+    @Excel(name = "钥匙编码")
+    private String keyCode;
+
+    @ApiModelProperty(value = "钥匙名称")
+    @Excel(name = "钥匙名称")
+    private String keyName;
+
+    @ApiModelProperty(value = "硬件类型ID")
+    private Long hardwareId;
+
+    @ApiModelProperty(value = "硬件类型Name")
+    @Excel(name = "硬件类型Name")
+    private String hardwareName;
+
+    @ApiModelProperty(value = "钥匙NFC")
+    @Excel(name = "钥匙NFC")
+    private String keyNfc;
+
+    @ApiModelProperty(value = "MAC地址")
+    @Excel(name = "MAC地址")
+    private String macAddress;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/lock/IsLockVO.java

@@ -0,0 +1,57 @@
+package com.ktg.iscs.domain.vo.lock;
+
+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
+ *
+ * @author cgj
+ * @date 2024-11-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsLockVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "挂锁ID")
+    @TableId(type = IdType.AUTO)
+    private Long lockId;
+
+    @ApiModelProperty(value = "挂锁编码")
+    @Excel(name = "挂锁编码")
+    private String lockCode;
+
+    @ApiModelProperty(value = "挂锁名称")
+    @Excel(name = "挂锁名称")
+    private String lockName;
+
+    @ApiModelProperty(value = "挂锁类型ID")
+    @Excel(name = "挂锁类型ID")
+    private Long lockTypeId;
+
+    @ApiModelProperty(value = "挂锁类型Name")
+    private String lockTypeName;
+
+    @ApiModelProperty(value = "硬件ID")
+    private Long hardwareId;
+
+    @ApiModelProperty(value = "硬件Name")
+    @Excel(name = "硬件Name")
+    private String hardwareName;
+
+    @ApiModelProperty(value = "挂锁NFC")
+    @Excel(name = "挂锁NFC")
+    private String lockNfc;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/lockset/IsLocksetVO.java

@@ -0,0 +1,60 @@
+package com.ktg.iscs.domain.vo.lockset;
+
+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_lockset
+ *
+ * @author cgj
+ * @date 2024-11-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsLocksetVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "锁具ID")
+    @TableId(type = IdType.AUTO)
+    private Long locksetId;
+
+    @ApiModelProperty(value = "锁具编码")
+    @Excel(name = "锁具编码")
+    private String locksetCode;
+
+    @ApiModelProperty(value = "锁具名称")
+    @Excel(name = "锁具名称")
+    private String locksetName;
+
+    @ApiModelProperty(value = "锁具类型ID")
+    private Long locksetTypeId;
+
+    @ApiModelProperty(value = "锁具类型Name")
+    private String locksetTypeName;
+
+    @ApiModelProperty(value = "物资ID")
+    @Excel(name = "物资ID")
+    private Long materialsId;
+
+    @ApiModelProperty(value = "物资Name")
+    private String materialsName;
+
+    @ApiModelProperty(value = "锁具NFC")
+    @Excel(name = "锁具NFC")
+    private String locksetNfc;
+
+    @ApiModelProperty(value = "锁具RFID")
+    @Excel(name = "锁具RFID")
+    private Long locksetRfid;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/locksetType/IsLocksetTypeVO.java

@@ -0,0 +1,63 @@
+package com.ktg.iscs.domain.vo.locksetType;
+
+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_lockset_type
+ *
+ * @author cgj
+ * @date 2024-11-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsLocksetTypeVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "锁具类型ID")
+    @TableId(type = IdType.AUTO)
+    private Long locksetTypeId;
+
+    @ApiModelProperty(value = "锁具类型编码")
+    @Excel(name = "锁具类型编码")
+    private String locksetTypeCode;
+
+    @ApiModelProperty(value = "锁具类型名称")
+    @Excel(name = "锁具类型名称")
+    private String locksetTypeName;
+
+    @ApiModelProperty(value = "锁具类型描述")
+    @Excel(name = "锁具类型描述")
+    private String locksetTypeDescription;
+
+    @ApiModelProperty(value = "锁具类型图标")
+    @Excel(name = "锁具类型图标")
+    private String locksetTypeIcon;
+
+    @ApiModelProperty(value = "锁具类型图片")
+    @Excel(name = "锁具类型图片")
+    private String locksetTypeImg;
+
+    @ApiModelProperty(value = "物资类型ID")
+    @Excel(name = "物资类型ID")
+    private Long materialsTypeId;
+
+    @ApiModelProperty(value = "物资类型Name")
+    private String materialsTypeName;
+
+    @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/IsKeyMapper.java

@@ -1,9 +1,12 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.common.query.LambdaQueryWrapperX;
 import com.ktg.iscs.domain.IsKey;
+import com.ktg.iscs.domain.vo.key.IsKeyVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -70,4 +73,6 @@ public interface IsKeyMapper extends BaseMapperX<IsKey>
      * @return 结果
      */
     int deleteIsKeyByKeyIds(Long[] keyIds);
+
+    Page<IsKeyVO> getIsKeyPage(Page<IsKey> page, @Param(value = "isKey") IsKey isKey);
 }

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

@@ -1,9 +1,13 @@
 package com.ktg.iscs.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsLock;
+import com.ktg.iscs.domain.vo.lock.IsLockVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 挂锁Mapper接口
@@ -65,4 +69,6 @@ public interface IsLockMapper extends BaseMapperX<IsLock>
      * @return 结果
      */
     int deleteIsLockByLockIds(Long[] lockIds);
+
+    Page<IsLockVO> getIsLockPage(Page<IsLock> page, @Param(value = "isLock") IsLock isLock);
 }

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

@@ -1,9 +1,13 @@
 package com.ktg.iscs.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsLockset;
+import com.ktg.iscs.domain.vo.lockset.IsLocksetVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 锁具Mapper接口
@@ -61,4 +65,6 @@ public interface IsLocksetMapper extends BaseMapperX<IsLockset>
      * @return 结果
      */
     int deleteIsLocksetByLocksetIds(Long[] locksetIds);
+
+    Page<IsLocksetVO> getIsLocksetPage(Page<IsLockset> page, @Param(value = "isLockset") IsLockset isLockset);
 }

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

@@ -1,9 +1,13 @@
 package com.ktg.iscs.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsLocksetType;
+import com.ktg.iscs.domain.vo.locksetType.IsLocksetTypeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 锁具类型Mapper接口
@@ -61,4 +65,6 @@ public interface IsLocksetTypeMapper extends BaseMapperX<IsLocksetType>
      * @return 结果
      */
     int deleteIsLocksetTypeByLocksetTypeIds(Long[] locksetTypeIds);
+
+    Page<IsLocksetTypeVO> getIsLocksetTypePage(Page<IsLocksetType> page, @Param(value = "isLocksetType") IsLocksetType isLocksetType);
 }

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

@@ -55,7 +55,11 @@ public interface HardwareApiService {
      */
     Boolean updateTicketLockStatus(UpdateTicketStatusDTO dto);
 
-
+    /**
+     * 批量更新作业票下隔离点的上锁状况
+     * @return
+     */
+    Boolean updateLockPointBatch(List<LockPointBatchDTO> list);
 
 
 

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

@@ -1,8 +1,11 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
 import com.ktg.iscs.domain.IsKey;
+import com.ktg.iscs.domain.vo.key.IsKeyVO;
+
+import java.util.List;
 
 /**
  * 钥匙Service接口
@@ -64,4 +67,6 @@ public interface IIsKeyService extends IService<IsKey>
      * @return 结果
      */
     int deleteIsKeyByKeyId(Long keyId);
+
+    Page<IsKeyVO> getIsKeyPage(Page<IsKey> page, IsKey isKey);
 }

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

@@ -1,8 +1,11 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
 import com.ktg.iscs.domain.IsLock;
+import com.ktg.iscs.domain.vo.lock.IsLockVO;
+
+import java.util.List;
 
 /**
  * 挂锁Service接口
@@ -68,4 +71,6 @@ public interface IIsLockService extends IService<IsLock>
      * @return 结果
      */
     int deleteIsLockByLockId(Long lockId);
+
+    Page<IsLockVO> getIsLockPage(Page<IsLock> page, IsLock isLock);
 }

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

@@ -1,8 +1,11 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
 import com.ktg.iscs.domain.IsLockset;
+import com.ktg.iscs.domain.vo.lockset.IsLocksetVO;
+
+import java.util.List;
 
 /**
  * 锁具Service接口
@@ -59,4 +62,6 @@ public interface IIsLocksetService extends IService<IsLockset>
      * @return 结果
      */
     int deleteIsLocksetByLocksetId(Long locksetId);
+
+    Page<IsLocksetVO> getIsLocksetPage(Page<IsLockset> page, IsLockset isLockset);
 }

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

@@ -1,8 +1,11 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
 import com.ktg.iscs.domain.IsLocksetType;
+import com.ktg.iscs.domain.vo.locksetType.IsLocksetTypeVO;
+
+import java.util.List;
 
 /**
  * 锁具类型Service接口
@@ -59,4 +62,6 @@ public interface IIsLocksetTypeService extends IService<IsLocksetType>
      * @return 结果
      */
     int deleteIsLocksetTypeByLocksetTypeId(Long locksetTypeId);
+
+    Page<IsLocksetTypeVO> getIsLocksetTypePage(Page<IsLocksetType> page, IsLocksetType isLocksetType);
 }

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

@@ -8,6 +8,7 @@ import com.ktg.iscs.domain.dto.hardwareApi.*;
 import com.ktg.iscs.domain.enums.KeyStatusEnum;
 import com.ktg.iscs.domain.enums.LockStatusEnum;
 import com.ktg.iscs.domain.enums.LocksetStatusEnum;
+import com.ktg.iscs.domain.enums.PointStatusEnum;
 import com.ktg.iscs.domain.vo.hardwareApi.JobTicketKeyVO;
 import com.ktg.iscs.domain.vo.hardwareApi.JobTicketLockVO;
 import com.ktg.iscs.domain.vo.hardwareApi.JobTicketLocksetVO;
@@ -47,6 +48,8 @@ public class HardwareApiServiceImpl implements HardwareApiService {
     private IIsJobTicketLocksetService iIsJobTicketLocksetService;
     @Autowired
     private IIsHardwareService isHardwareService;
+    @Autowired
+    private IIsJobTicketPointsService iIsJobTicketPointsService;
 
 
     @Override
@@ -247,7 +250,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
     public Boolean updateTicketLockPoint(LockPointDTO dto) {
         Assert.notNull(dto.getTicketId(), "请告诉我关于哪个作业票!");
         Assert.notBlank(dto.getLockNfc(), "挂锁nfc缺失!");
-        Assert.notNull(dto.getPointNfc(), "请告知隔离点信息!");
+        Assert.notBlank(dto.getPointNfc(), "请告知隔离点信息!");
         // 1.通过nfc查询挂锁信息
         IsLock lock = iIsLockService.getOne(Wrappers.<IsLock>lambdaQuery()
                 .eq(IsLock::getLockNfc, dto.getLockNfc()));
@@ -261,7 +264,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                 .eq(IsJobTicketLock::getTicketId, dto.getTicketId())
                 .eq(IsJobTicketLock::getLockId, lock.getLockId())
                 .set(IsJobTicketLock::getIsolationPointId, point.getPointId())
-                .set(IsJobTicketLock::getLockStatus, LockStatusEnum.RETURN_LOCK.status));
+                .set(IsJobTicketLock::getLockStatus, LockStatusEnum.LOCKED.status));
         return true;
     }
 
@@ -282,6 +285,63 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    @Override
+    public Boolean updateLockPointBatch(List<LockPointBatchDTO> list) {
+        Assert.isFalse(list.isEmpty(), "没有接收到数据啊!");
+        // 情况复杂，循环处理
+        for (LockPointBatchDTO dto : list) {
+            Assert.notNull(dto.getTicketId(), "请告诉我关于哪个作业票!");
+            Assert.notBlank(dto.getLockNfc(), "挂锁nfc缺失!");
+            Assert.notBlank(dto.getPointNfc(), "请告知隔离点信息!");
+            Assert.notNull(dto.getTarget(), "请告我是去挂锁还是解锁!");
+            Assert.notNull(dto.getStatus(), "请告我任务当前状态!");
+            Assert.notBlank(dto.getKeyNfc(), "钥匙信息不可为空!");
+            // 1.通过nfc查询挂锁信息
+            IsLock lock = iIsLockService.getOne(Wrappers.<IsLock>lambdaQuery()
+                    .eq(IsLock::getLockNfc, dto.getLockNfc()));
+            Assert.notNull(lock, "该nfc无对应的挂锁信息");
+            // 1..通过nfc查询钥匙信息
+            IsKey key = isKeyService.getOne(Wrappers.<IsKey>lambdaQuery()
+                    .eq(IsKey::getKeyNfc, dto.getKeyNfc()));
+            Assert.notNull(lock, "该nfc无对应的挂锁信息");
+            // 2.通过nfc查询隔离点信息
+            IsIsolationPoint point = iIsIsolationPointService.getOne(Wrappers.<IsIsolationPoint>lambdaQuery()
+                    .eq(IsIsolationPoint::getPointNfc, dto.getPointNfc()));
+            Assert.notNull(point, "该nfc无对应的隔离点信息");
+            Date date = new Date();
+            if (dto.getTarget().equals(0)) {
+                // 2.1更新隔离点上锁信息
+                iIsJobTicketPointsService.update(Wrappers.<IsJobTicketPoints>lambdaUpdate()
+                        .eq(IsJobTicketPoints::getTicketId, dto.getTicketId())
+                        .eq(IsJobTicketPoints::getPointId, point.getPointId())
+                        .set(IsJobTicketPoints::getLockId, lock.getLockId())
+                        .set(IsJobTicketPoints::getLockedByKeyId, key.getKeyId())
+                        .set(IsJobTicketPoints::getLockTime, date)
+                        .set(IsJobTicketPoints::getPointStatus, PointStatusEnum.LOCKED.status));
+                // 3.开始更新上锁时挂锁信息
+                iIsJobTicketLockService.update(Wrappers.<IsJobTicketLock>lambdaUpdate()
+                        .eq(IsJobTicketLock::getTicketId, dto.getTicketId())
+                        .eq(IsJobTicketLock::getLockId, lock.getLockId())
+                        .set(IsJobTicketLock::getIsolationPointId, point.getPointId())
+                        .set(IsJobTicketLock::getLockStatus, LockStatusEnum.LOCKED.status));
+            } else {
+                // 2.1.1更新隔离点解锁信息
+                iIsJobTicketPointsService.update(Wrappers.<IsJobTicketPoints>lambdaUpdate()
+                        .eq(IsJobTicketPoints::getTicketId, dto.getTicketId())
+                        .eq(IsJobTicketPoints::getPointId, point.getPointId())
+                        .set(IsJobTicketPoints::getUnlockedByKeyId, key.getKeyId())
+                        .set(IsJobTicketPoints::getUnlockTime, date)
+                        .set(IsJobTicketPoints::getPointStatus, PointStatusEnum.REMOVE_LOCK.status));
+                // 3.1开始更新解锁时挂锁信息
+                iIsJobTicketLockService.update(Wrappers.<IsJobTicketLock>lambdaUpdate()
+                        .eq(IsJobTicketLock::getTicketId, dto.getTicketId())
+                        .eq(IsJobTicketLock::getLockId, lock.getLockId())
+                        .set(IsJobTicketLock::getLockStatus, LockStatusEnum.REMOVED_LOCK.status));
+            }
+        }
+        return true;
+    }
+
     @Override
     public Boolean updateLocksetTake(List<TakeLocksetDTO> list) {
         Assert.isFalse(list.isEmpty(), "请取出至少一个辅件!");

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

@@ -1,15 +1,18 @@
 package com.ktg.iscs.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
 import cn.hutool.core.lang.Assert;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsKeyMapper;
 import com.ktg.iscs.domain.IsKey;
+import com.ktg.iscs.domain.vo.key.IsKeyVO;
+import com.ktg.iscs.mapper.IsKeyMapper;
 import com.ktg.iscs.service.IIsKeyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 钥匙Service业务层处理
@@ -103,4 +106,9 @@ public class IsKeyServiceImpl extends ServiceImpl<IsKeyMapper, IsKey> implements
     {
         return isKeyMapper.deleteIsKeyByKeyId(keyId);
     }
+
+    @Override
+    public Page<IsKeyVO> getIsKeyPage(Page<IsKey> page, IsKey isKey) {
+        return isKeyMapper.getIsKeyPage(page, isKey);
+    }
 }

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

@@ -1,15 +1,18 @@
 package com.ktg.iscs.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
 import cn.hutool.core.lang.Assert;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsLockMapper;
 import com.ktg.iscs.domain.IsLock;
+import com.ktg.iscs.domain.vo.lock.IsLockVO;
+import com.ktg.iscs.mapper.IsLockMapper;
 import com.ktg.iscs.service.IIsLockService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 挂锁Service业务层处理
@@ -110,4 +113,9 @@ public class IsLockServiceImpl extends ServiceImpl<IsLockMapper, IsLock> impleme
     {
         return isLockMapper.deleteIsLockByLockId(lockId);
     }
+
+    @Override
+    public Page<IsLockVO> getIsLockPage(Page<IsLock> page, IsLock isLock) {
+        return isLockMapper.getIsLockPage(page, isLock);
+    }
 }

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

@@ -1,15 +1,18 @@
 package com.ktg.iscs.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
 import cn.hutool.core.lang.Assert;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsLocksetMapper;
 import com.ktg.iscs.domain.IsLockset;
+import com.ktg.iscs.domain.vo.lockset.IsLocksetVO;
+import com.ktg.iscs.mapper.IsLocksetMapper;
 import com.ktg.iscs.service.IIsLocksetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 锁具Service业务层处理
@@ -98,4 +101,9 @@ public class IsLocksetServiceImpl extends ServiceImpl<IsLocksetMapper, IsLockset
     {
         return isLocksetMapper.deleteIsLocksetByLocksetId(locksetId);
     }
+
+    @Override
+    public Page<IsLocksetVO> getIsLocksetPage(Page<IsLockset> page, IsLockset isLockset) {
+        return isLocksetMapper.getIsLocksetPage(page, isLockset);
+    }
 }

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

@@ -1,15 +1,18 @@
 package com.ktg.iscs.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
 import cn.hutool.core.lang.Assert;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsLocksetTypeMapper;
 import com.ktg.iscs.domain.IsLocksetType;
+import com.ktg.iscs.domain.vo.locksetType.IsLocksetTypeVO;
+import com.ktg.iscs.mapper.IsLocksetTypeMapper;
 import com.ktg.iscs.service.IIsLocksetTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 锁具类型Service业务层处理
@@ -98,4 +101,9 @@ public class IsLocksetTypeServiceImpl extends ServiceImpl<IsLocksetTypeMapper, I
     {
         return isLocksetTypeMapper.deleteIsLocksetTypeByLocksetTypeId(locksetTypeId);
     }
+
+    @Override
+    public Page<IsLocksetTypeVO> getIsLocksetTypePage(Page<IsLocksetType> page, IsLocksetType isLocksetType) {
+        return isLocksetTypeMapper.getIsLocksetTypePage(page, isLocksetType);
+    }
 }

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

@@ -178,7 +178,20 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
                 iIsSopPointsService.save(newSopPoints);
             }
         }
-        // 3.开始执行更新操作
+        // 3.新增人员信息到模板
+        // 3.1先清除原先的人员数据
+        iIsSopUserService.remove(Wrappers.<IsSopUser>lambdaQuery().eq(IsSopUser::getSopId, dto.getSopId()));
+        if (!dto.getTicketUserDTOList().isEmpty()) {
+            for (AddSopUserDTO addSopUserDTO : dto.getTicketUserDTOList()) {
+                IsSopUser sopUser = BeanUtils.toBean(addSopUserDTO, IsSopUser.class);
+                sopUser.setSopId(dto.getSopId());
+                if (null == addSopUserDTO.getUserId() || addSopUserDTO.getUserId() == 0) {
+                    addSopUserDTO.setUserId(0L);
+                }
+                iIsSopUserService.save(sopUser);
+            }
+        }
+        // 4.开始执行更新操作
         IsSop isSop = BeanUtils.toBean(dto, IsSop.class);
         isSopMapper.updateById(isSop);
         return true;

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsKeyMapper">
-    
+
     <resultMap type="IsKey" id="IsKeyResult">
         <result property="keyId"    column="key_id"    />
         <result property="keyCode"    column="key_code"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsKeyList" parameterType="IsKey" resultMap="IsKeyResult">
         <include refid="selectIsKeyVo"/>
-        <where>  
+        <where>
             <if test="keyCode != null  and keyCode != ''"> and key_code = #{keyCode}</if>
             <if test="keyName != null  and keyName != ''"> and key_name like concat('%', #{keyName}, '%')</if>
             <if test="hardwareId != null "> and hardware_id = #{hardwareId}</if>
@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="macAddress != null  and macAddress != ''"> and mac_address = #{macAddress}</if>
         </where>
     </select>
-    
+
     <select id="selectIsKeyByKeyId" parameterType="Long" resultMap="IsKeyResult">
         <include refid="selectIsKeyVo"/>
         where key_id = #{keyId}
     </select>
-        
+
     <insert id="insertIsKey" parameterType="IsKey" useGeneratedKeys="true" keyProperty="keyId">
         insert into is_key
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -92,9 +92,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsKeyByKeyIds" parameterType="String">
-        delete from is_key where key_id in 
+        delete from is_key where key_id in
         <foreach item="keyId" collection="array" open="(" separator="," close=")">
             #{keyId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsKeyPage" resultType="com.ktg.iscs.domain.vo.key.IsKeyVO">
+        SELECT
+        k.*,
+        h.hardware_name
+        FROM
+        is_key k
+        LEFT JOIN is_hardware h ON k.key_id = h.id
+        <where>
+            <if test="isKey.keyCode != null and isKey.keyCode.trim != ''">
+                and k.key_code like concat('%',#{isKey.keyCode},'%')
+            </if>
+            <if test="isKey.keyName != null and isKey.keyName.trim != ''">
+                and k.key_name like concat('%',#{isKey.keyName},'%')
+            </if>
+            <if test="isKey.hardwareId != null">
+                and k.hardware_id = #{isKey.hardwareId}
+            </if>
+        </where>
+        ORDER BY
+        k.key_id DESC
+
+    </select>
+
+</mapper>

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsLockMapper">
-    
+
     <resultMap type="IsLock" id="IsLockResult">
         <result property="lockId"    column="lock_id"    />
         <result property="lockCode"    column="lock_code"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsLockList" parameterType="IsLock" resultMap="IsLockResult">
         <include refid="selectIsLockVo"/>
-        <where>  
+        <where>
             <if test="lockCode != null  and lockCode != ''"> and lock_code = #{lockCode}</if>
             <if test="lockName != null  and lockName != ''"> and lock_name like concat('%', #{lockName}, '%')</if>
             <if test="lockTypeId != null "> and lock_type_id = #{lockTypeId}</if>
@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lockNfc != null  and lockNfc != ''"> and lock_nfc = #{lockNfc}</if>
         </where>
     </select>
-    
+
     <select id="selectIsLockByLockId" parameterType="Long" resultMap="IsLockResult">
         <include refid="selectIsLockVo"/>
         where lock_id = #{lockId}
     </select>
-        
+
     <insert id="insertIsLock" parameterType="IsLock" useGeneratedKeys="true" keyProperty="lockId">
         insert into is_lock
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -92,9 +92,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsLockByLockIds" parameterType="String">
-        delete from is_lock where lock_id in 
+        delete from is_lock where lock_id in
         <foreach item="lockId" collection="array" open="(" separator="," close=")">
             #{lockId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsLockPage" resultType="com.ktg.iscs.domain.vo.lock.IsLockVO">
+        SELECT
+        l.*,
+        lt.lock_type_name,
+        h.hardware_type_name
+        FROM
+        is_lock l
+        LEFT JOIN is_lock_type lt ON l.lock_type_id = lt.lock_type_id
+        LEFT JOIN is_hardware h ON l.hardware_id = h.id
+        <where>
+            <if test="isLock.lockCode != null and isLock.lockCode.trim != ''">
+                and l.lock_code like concat('%',#{isLock.lockCode},'%')
+            </if>
+            <if test="isLock.lockName != null and isLock.lockName.trim != ''">
+                and l.lock_name like concat('%',#{isLock.lockName},'%')
+            </if>
+            <if test="isLock.lockTypeId != null">
+                and l.lock_type_id = #{isLock.lockTypeId}
+            </if>
+        </where>
+        ORDER BY
+        l.lock_id DESC
+    </select>
+
+</mapper>

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

@@ -120,10 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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},'%')
+                and l.lock_type_code like concat('%',#{isLockType.lockTypeCode},'%')
             </if>
             <if test="isLockType.lockTypeName != null and isLockType.lockTypeName.trim != ''">
-                and l.lock_type_namee like concat('%',#{isLockType.lockTypeName},'%')
+                and l.lock_type_name like concat('%',#{isLockType.lockTypeName},'%')
             </if>
         </where>
         ORDER BY

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsLocksetMapper">
-    
+
     <resultMap type="IsLockset" id="IsLocksetResult">
         <result property="locksetId"    column="lockset_id"    />
         <result property="locksetCode"    column="lockset_code"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsLocksetList" parameterType="IsLockset" resultMap="IsLocksetResult">
         <include refid="selectIsLocksetVo"/>
-        <where>  
+        <where>
             <if test="locksetCode != null  and locksetCode != ''"> and lockset_code = #{locksetCode}</if>
             <if test="locksetName != null  and locksetName != ''"> and lockset_name like concat('%', #{locksetName}, '%')</if>
             <if test="locksetTypeId != null "> and lockset_type_id = #{locksetTypeId}</if>
@@ -35,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="locksetRfid != null "> and lockset_rfid = #{locksetRfid}</if>
         </where>
     </select>
-    
+
     <select id="selectIsLocksetByLocksetId" parameterType="Long" resultMap="IsLocksetResult">
         <include refid="selectIsLocksetVo"/>
         where lockset_id = #{locksetId}
     </select>
-        
+
     <insert id="insertIsLockset" parameterType="IsLockset" useGeneratedKeys="true" keyProperty="locksetId">
         insert into is_lockset
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -97,9 +97,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsLocksetByLocksetIds" parameterType="String">
-        delete from is_lockset where lockset_id in 
+        delete from is_lockset where lockset_id in
         <foreach item="locksetId" collection="array" open="(" separator="," close=")">
             #{locksetId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsLocksetPage" resultType="com.ktg.iscs.domain.vo.lockset.IsLocksetVO">
+        SELECT
+        l.*,
+        lt.lockset_type_name,
+        m.materials_name
+        FROM
+        is_lockset l
+        LEFT JOIN is_lockset_type lt ON l.lockset_type_id = lt.lockset_type_id
+        LEFT JOIN is_materials m ON l.materials_id = m.materials_id
+        <where>
+            <if test="isLockset.locksetCode != null and isLockset.locksetCode.trim != ''">
+                and l.lockset_code like concat('%',#{isLockset.locksetCode},'%')
+            </if>
+            <if test="isLockset.locksetName != null and isLockset.locksetName.trim != ''">
+                and l.lockset_name like concat('%',#{isLockset.locksetName},'%')
+            </if>
+            <if test="isLockset.locksetTypeId != null">
+                and l.lockset_type_id = #{isLockset.locksetTypeId}
+            </if>
+        </where>
+        ORDER BY
+        l.lockset_id DESC
+    </select>
+
+</mapper>

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

@@ -110,4 +110,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{locksetTypeId}
         </foreach>
     </delete>
+
+    <select id="getIsLocksetTypePage" resultType="com.ktg.iscs.domain.vo.locksetType.IsLocksetTypeVO">
+        SELECT
+        l.*,
+        m.materials_type_name
+        FROM
+        is_lockset_type l
+        LEFT JOIN is_materials_type m ON l.materials_type_id = m.materials_type_id
+        <where>
+            <if test="isLocksetType.locksetTypeCode != null and isLocksetType.locksetTypeCode.trim != ''">
+                and l.lockset_type_code like concat('%',#{isLocksetType.locksetTypeCode},'%')
+            </if>
+            <if test="isLocksetType.locksetTypeName != null and isLocksetType.locksetTypeName.trim != ''">
+                and l.lockset_type_name like concat('%',#{isLocksetType.locksetTypeName},'%')
+            </if>
+        </where>
+        ORDER BY
+        l.lockset_type_id DESC
+    </select>
+
 </mapper>