修改隔离点表结构 新增工作卡文件初始化

ktg-generator/src/main/resources/generator.yml

@@ -1,10 +1,10 @@
 # 代码生成
-gen: 
+gen:
   # 作者
-  author: yinjinlu
+  author: cgj
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ktg.mes.md
+  packageName: com.ktg.mes.iscs
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: md_
+  tablePrefix: md_

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

@@ -55,7 +55,7 @@ public class IsIsolationPointController extends BaseController {
                 .eq(StringUtils.isNotBlank(dto.getPowerType()), IsIsolationPoint::getPowerType, dto.getPowerType())
                 .ge(StringUtils.isNotBlank(dto.getStartTime()), IsIsolationPoint::getCreateTime, dto.getStartTime())
                 .le(StringUtils.isNotBlank(dto.getEndTime()), IsIsolationPoint::getCreateTime, dto.getEndTime())
-                .eq(StringUtils.isNotBlank(dto.getLockType()), IsIsolationPoint::getLockType, dto.getLockType())
+                .eq(dto.getLockTypeId() != null, IsIsolationPoint::getLockTypeId, dto.getLockTypeId())
                 .orderByDesc(IsIsolationPoint::getPointId));
         return CommonResult.success(result);
     }

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

@@ -0,0 +1,116 @@
+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.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsJobCard;
+import com.ktg.iscs.service.IIsJobCardService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 工作卡Controller
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@Api(tags = "工作卡")
+@RestController
+@RequestMapping("/iscs/card")
+public class IsJobCardController extends BaseController
+{
+    @Autowired
+    private IIsJobCardService isJobCardService;
+
+    /**
+     * 查询工作卡分页
+     */
+    @ApiOperation("查询工作卡-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isJobCard", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:card:list')")
+    @GetMapping("/getIsJobCardPage")
+    public CommonResult<Page<IsJobCard>> getIsJobCardPage(Page<IsJobCard> page, IsJobCard isJobCard)
+    {
+        Page<IsJobCard> result = isJobCardService.page(page, Wrappers.<IsJobCard>lambdaQuery()
+                .orderByDesc(IsJobCard::getCardId));
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出工作卡列表
+     */
+    @ApiOperation("导出工作卡列表")
+    @Parameter(name = "isJobCard", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:card:export')")
+    @Log(title = "工作卡", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsJobCard")
+    public void exportIsJobCard(HttpServletResponse response, IsJobCard isJobCard)
+    {
+        List<IsJobCard> list = isJobCardService.selectIsJobCardList(isJobCard);
+        ExcelUtil<IsJobCard> util = new ExcelUtil<IsJobCard>(IsJobCard.class);
+        util.exportExcel(response, list, "工作卡数据");
+    }
+
+    /**
+     * 获取工作卡详细信息
+     */
+    @ApiOperation("获取工作卡详细信息")
+    @Parameter(name = "cardId", description = "cardId")
+    @PreAuthorize("@ss.hasPermi('iscs:card:query')")
+    @GetMapping(value = "/selectIsJobCardById")
+    public CommonResult<IsJobCard> selectIsJobCardById(Long cardId)
+    {
+        return CommonResult.success(isJobCardService.selectIsJobCardByCardId(cardId));
+    }
+
+    /**
+     * 新增工作卡
+     */
+    @ApiOperation("新增工作卡")
+    @PreAuthorize("@ss.hasPermi('iscs:card:add')")
+    @Log(title = "工作卡", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsJobCard")
+    public CommonResult<Boolean> insertIsJobCard(@RequestBody @Parameter(name = "isJobCard", description = "新增数据类,放到body") IsJobCard isJobCard)
+    {
+        return CommonResult.success(isJobCardService.insertIsJobCard(isJobCard) == 1);
+    }
+
+    /**
+     * 修改工作卡
+     */
+    @ApiOperation("修改工作卡")
+    @PreAuthorize("@ss.hasPermi('iscs:card:edit')")
+    @Log(title = "工作卡", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsJobCard")
+    public CommonResult<Boolean> updateIsJobCard(@RequestBody @Parameter(name = "isJobCard", description = "修改数据类,放到body") IsJobCard isJobCard)
+    {
+        return CommonResult.success(isJobCardService.updateIsJobCard(isJobCard) == 1);
+    }
+
+    /**
+     * 删除工作卡
+     */
+    @ApiOperation("删除工作卡")
+    @PreAuthorize("@ss.hasPermi('iscs:card:remove')")
+    @Log(title = "工作卡", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsJobCardByCardIds")
+    public CommonResult<Boolean> deleteIsJobCardByCardIds(String cardIds)
+    {
+        return CommonResult.success(isJobCardService.deleteIsJobCardByCardIds(cardIds) != 0);
+    }
+}

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

@@ -0,0 +1,116 @@
+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.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsLockType;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 物资类型Controller
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@Api(tags = "物资类型")
+@RestController
+@RequestMapping("/iscs/type")
+public class IsLockTypeController extends BaseController
+{
+    @Autowired
+    private IIsLockTypeService isLockTypeService;
+
+    /**
+     * 查询物资类型分页
+     */
+    @ApiOperation("查询物资类型-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isLockType", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:type:list')")
+    @GetMapping("/getIsLockTypePage")
+    public CommonResult<Page<IsLockType>> getIsLockTypePage(Page<IsLockType> page, IsLockType isLockType)
+    {
+        Page<IsLockType> result = isLockTypeService.page(page, Wrappers.<IsLockType>lambdaQuery()
+                .orderByDesc(IsLockType::getLockTypeId));
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出物资类型列表
+     */
+    @ApiOperation("导出物资类型列表")
+    @Parameter(name = "isLockType", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:type:export')")
+    @Log(title = "物资类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsLockType")
+    public void exportIsLockType(HttpServletResponse response, IsLockType isLockType)
+    {
+        List<IsLockType> list = isLockTypeService.selectIsLockTypeList(isLockType);
+        ExcelUtil<IsLockType> util = new ExcelUtil<IsLockType>(IsLockType.class);
+        util.exportExcel(response, list, "物资类型数据");
+    }
+
+    /**
+     * 获取物资类型详细信息
+     */
+    @ApiOperation("获取物资类型详细信息")
+    @Parameter(name = "lockTypeId", description = "lockTypeId")
+    @PreAuthorize("@ss.hasPermi('iscs:type:query')")
+    @GetMapping(value = "/selectIsLockTypeById")
+    public CommonResult<IsLockType> selectIsLockTypeById(Long lockTypeId)
+    {
+        return CommonResult.success(isLockTypeService.selectIsLockTypeByLockTypeId(lockTypeId));
+    }
+
+    /**
+     * 新增物资类型
+     */
+    @ApiOperation("新增物资类型")
+    @PreAuthorize("@ss.hasPermi('iscs:type:add')")
+    @Log(title = "物资类型", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsLockType")
+    public CommonResult<Boolean> insertIsLockType(@RequestBody @Parameter(name = "isLockType", description = "新增数据类,放到body") IsLockType isLockType)
+    {
+        return CommonResult.success(isLockTypeService.insertIsLockType(isLockType) == 1);
+    }
+
+    /**
+     * 修改物资类型
+     */
+    @ApiOperation("修改物资类型")
+    @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
+    @Log(title = "物资类型", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsLockType")
+    public CommonResult<Boolean> updateIsLockType(@RequestBody @Parameter(name = "isLockType", description = "修改数据类,放到body") IsLockType isLockType)
+    {
+        return CommonResult.success(isLockTypeService.updateIsLockType(isLockType) == 1);
+    }
+
+    /**
+     * 删除物资类型
+     */
+    @ApiOperation("删除物资类型")
+    @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
+    @Log(title = "物资类型", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsLockTypeByLockTypeIds")
+    public CommonResult<Boolean> deleteIsLockTypeByLockTypeIds(String lockTypeIds)
+    {
+        return CommonResult.success(isLockTypeService.deleteIsLockTypeByLockTypeIds(lockTypeIds) != 0);
+    }
+}

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

@@ -74,13 +74,8 @@ public class IsIsolationPoint extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
-    @ApiModelProperty(value = "锁具名称")
-    private String lockName;
+    @ApiModelProperty(value = "锁具类型id")
+    private Long lockTypeId;
 
-    @ApiModelProperty(value = "锁具类型")
-    private String lockType;
-
-    @ApiModelProperty(value = "锁具图片")
-    private String lockImg;
 
 }

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

@@ -0,0 +1,55 @@
+package com.ktg.iscs.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+
+/**
+ * 工作卡对象 is_job_card
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsJobCard extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "工作卡ID")
+    @TableId(type = IdType.AUTO)
+    private Long cardId;
+
+    @ApiModelProperty(value = "工作卡编号")
+    @Excel(name = "工作卡编号")
+    private String cardCode;
+
+    @ApiModelProperty(value = "硬件ID")
+    @Excel(name = "硬件ID")
+    private Long hardwareId;
+
+    @ApiModelProperty(value = "工作卡NFC")
+    @Excel(name = "工作卡NFC")
+    private String cardNfc;
+
+    @ApiModelProperty(value = "1: 员工卡；2: 临时卡")
+    @Excel(name = "1: 员工卡；2: 临时卡")
+    private Integer cardType;
+
+    @ApiModelProperty(value = "绑定用户ID")
+    @Excel(name = "绑定用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户名称或临时用户ID")
+    @Excel(name = "用户名称或临时用户ID")
+    private String userName;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,55 @@
+package com.ktg.iscs.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+
+/**
+ * 物资类型对象 is_lock_type
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsLockType 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")
+    @Excel(name = "硬件类型ID")
+    private Long hardwareTypeId;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/point/PagePointDTO.java

@@ -34,7 +34,7 @@ public class PagePointDTO
     @ApiModelProperty(value = "结束时间")
     private String endTime;
 
-    @ApiModelProperty(value = "锁具类型")
-    private String lockType;
+    @ApiModelProperty(value = "锁具类型id")
+    private Long lockTypeId;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -62,6 +62,9 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "锁具类型id")
+    private Long lockTypeId;
+
     @ApiModelProperty(value = "锁具名称")
     private String lockName;
 

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

@@ -0,0 +1,65 @@
+package com.ktg.iscs.mapper;
+
+import com.ktg.common.mapper.BaseMapperX;
+import com.ktg.iscs.domain.IsJobCard;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 工作卡Mapper接口
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@Mapper
+public interface IsJobCardMapper extends BaseMapperX<IsJobCard>
+{
+    /**
+     * 查询工作卡
+     *
+     * @param cardId 工作卡主键
+     * @return 工作卡
+     */
+    IsJobCard selectIsJobCardByCardId(Long cardId);
+
+    /**
+     * 查询工作卡列表
+     *
+     * @param isJobCard 工作卡
+     * @return 工作卡集合
+     */
+    List<IsJobCard> selectIsJobCardList(IsJobCard isJobCard);
+
+    /**
+     * 新增工作卡
+     *
+     * @param isJobCard 工作卡
+     * @return 结果
+     */
+    int insertIsJobCard(IsJobCard isJobCard);
+
+    /**
+     * 修改工作卡
+     *
+     * @param isJobCard 工作卡
+     * @return 结果
+     */
+    int updateIsJobCard(IsJobCard isJobCard);
+
+    /**
+     * 删除工作卡
+     *
+     * @param cardId 工作卡主键
+     * @return 结果
+     */
+    int deleteIsJobCardByCardId(Long cardId);
+
+    /**
+     * 批量删除工作卡
+     *
+     * @param cardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteIsJobCardByCardIds(Long[] cardIds);
+}

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

@@ -0,0 +1,65 @@
+package com.ktg.iscs.mapper;
+
+import com.ktg.common.mapper.BaseMapperX;
+import com.ktg.iscs.domain.IsLockType;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 物资类型Mapper接口
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@Mapper
+public interface IsLockTypeMapper extends BaseMapperX<IsLockType>
+{
+    /**
+     * 查询物资类型
+     *
+     * @param lockTypeId 物资类型主键
+     * @return 物资类型
+     */
+    IsLockType selectIsLockTypeByLockTypeId(Long lockTypeId);
+
+    /**
+     * 查询物资类型列表
+     *
+     * @param isLockType 物资类型
+     * @return 物资类型集合
+     */
+    List<IsLockType> selectIsLockTypeList(IsLockType isLockType);
+
+    /**
+     * 新增物资类型
+     *
+     * @param isLockType 物资类型
+     * @return 结果
+     */
+    int insertIsLockType(IsLockType isLockType);
+
+    /**
+     * 修改物资类型
+     *
+     * @param isLockType 物资类型
+     * @return 结果
+     */
+    int updateIsLockType(IsLockType isLockType);
+
+    /**
+     * 删除物资类型
+     *
+     * @param lockTypeId 物资类型主键
+     * @return 结果
+     */
+    int deleteIsLockTypeByLockTypeId(Long lockTypeId);
+
+    /**
+     * 批量删除物资类型
+     *
+     * @param lockTypeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteIsLockTypeByLockTypeIds(Long[] lockTypeIds);
+}

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

@@ -0,0 +1,63 @@
+package com.ktg.iscs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ktg.iscs.domain.IsJobCard;
+
+import java.util.List;
+
+/**
+ * 工作卡Service接口
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+public interface IIsJobCardService extends IService<IsJobCard>
+{
+    /**
+     * 查询工作卡
+     *
+     * @param cardId 工作卡主键
+     * @return 工作卡
+     */
+    IsJobCard selectIsJobCardByCardId(Long cardId);
+
+    /**
+     * 查询工作卡列表
+     *
+     * @param isJobCard 工作卡
+     * @return 工作卡集合
+     */
+    List<IsJobCard> selectIsJobCardList(IsJobCard isJobCard);
+
+    /**
+     * 新增工作卡
+     *
+     * @param isJobCard 工作卡
+     * @return 结果
+     */
+    int insertIsJobCard(IsJobCard isJobCard);
+
+    /**
+     * 修改工作卡
+     *
+     * @param isJobCard 工作卡
+     * @return 结果
+     */
+    int updateIsJobCard(IsJobCard isJobCard);
+
+    /**
+     * 批量删除工作卡
+     *
+     * @param cardIds 需要删除的工作卡主键集合
+     * @return 结果
+     */
+    int deleteIsJobCardByCardIds(String cardIds);
+
+    /**
+     * 删除工作卡信息
+     *
+     * @param cardId 工作卡主键
+     * @return 结果
+     */
+    int deleteIsJobCardByCardId(Long cardId);
+}

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

@@ -0,0 +1,63 @@
+package com.ktg.iscs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ktg.iscs.domain.IsLockType;
+
+import java.util.List;
+
+/**
+ * 物资类型Service接口
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+public interface IIsLockTypeService extends IService<IsLockType>
+{
+    /**
+     * 查询物资类型
+     *
+     * @param lockTypeId 物资类型主键
+     * @return 物资类型
+     */
+    IsLockType selectIsLockTypeByLockTypeId(Long lockTypeId);
+
+    /**
+     * 查询物资类型列表
+     *
+     * @param isLockType 物资类型
+     * @return 物资类型集合
+     */
+    List<IsLockType> selectIsLockTypeList(IsLockType isLockType);
+
+    /**
+     * 新增物资类型
+     *
+     * @param isLockType 物资类型
+     * @return 结果
+     */
+    int insertIsLockType(IsLockType isLockType);
+
+    /**
+     * 修改物资类型
+     *
+     * @param isLockType 物资类型
+     * @return 结果
+     */
+    int updateIsLockType(IsLockType isLockType);
+
+    /**
+     * 批量删除物资类型
+     *
+     * @param lockTypeIds 需要删除的物资类型主键集合
+     * @return 结果
+     */
+    int deleteIsLockTypeByLockTypeIds(String lockTypeIds);
+
+    /**
+     * 删除物资类型信息
+     *
+     * @param lockTypeId 物资类型主键
+     * @return 结果
+     */
+    int deleteIsLockTypeByLockTypeId(Long lockTypeId);
+}

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

@@ -0,0 +1,102 @@
+package com.ktg.iscs.service.impl;
+
+import cn.hutool.core.lang.Assert;
+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.IsJobCard;
+import com.ktg.iscs.mapper.IsJobCardMapper;
+import com.ktg.iscs.service.IIsJobCardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 工作卡Service业务层处理
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@Service
+public class IsJobCardServiceImpl extends ServiceImpl<IsJobCardMapper, IsJobCard> implements IIsJobCardService
+{
+    @Autowired
+    private IsJobCardMapper isJobCardMapper;
+
+    /**
+     * 查询工作卡
+     *
+     * @param cardId 工作卡主键
+     * @return 工作卡
+     */
+    @Override
+    public IsJobCard selectIsJobCardByCardId(Long cardId)
+    {
+        return isJobCardMapper.selectIsJobCardByCardId(cardId);
+    }
+
+    /**
+     * 查询工作卡列表
+     *
+     * @param isJobCard 工作卡
+     * @return 工作卡
+     */
+    @Override
+    public List<IsJobCard> selectIsJobCardList(IsJobCard isJobCard)
+    {
+        return isJobCardMapper.selectIsJobCardList(isJobCard);
+    }
+
+    /**
+     * 新增工作卡
+     *
+     * @param isJobCard 工作卡
+     * @return 结果
+     */
+    @Override
+    public int insertIsJobCard(IsJobCard isJobCard)
+    {
+        isJobCard.setCreateTime(DateUtils.getNowDate());
+        return isJobCardMapper.insertIsJobCard(isJobCard);
+    }
+
+    /**
+     * 修改工作卡
+     *
+     * @param isJobCard 工作卡
+     * @return 结果
+     */
+    @Override
+    public int updateIsJobCard(IsJobCard isJobCard)
+    {
+        isJobCard.setUpdateTime(DateUtils.getNowDate());
+        return isJobCardMapper.updateIsJobCard(isJobCard);
+    }
+
+    /**
+     * 批量删除工作卡
+     *
+     * @param cardIds 需要删除的工作卡主键
+     * @return 结果
+     */
+    @Override
+    public int deleteIsJobCardByCardIds(String cardIds)
+    {
+        Assert.notBlank(cardIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(cardIds);
+        return isJobCardMapper.deleteIsJobCardByCardIds(longIds);
+    }
+
+    /**
+     * 删除工作卡信息
+     *
+     * @param cardId 工作卡主键
+     * @return 结果
+     */
+    @Override
+    public int deleteIsJobCardByCardId(Long cardId)
+    {
+        return isJobCardMapper.deleteIsJobCardByCardId(cardId);
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.ktg.iscs.service.impl;
+
+import cn.hutool.core.lang.Assert;
+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.IsLockType;
+import com.ktg.iscs.mapper.IsLockTypeMapper;
+import com.ktg.iscs.service.IIsLockTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 物资类型Service业务层处理
+ *
+ * @author cgj
+ * @date 2024-11-12
+ */
+@Service
+public class IsLockTypeServiceImpl extends ServiceImpl<IsLockTypeMapper, IsLockType> implements IIsLockTypeService
+{
+    @Autowired
+    private IsLockTypeMapper isLockTypeMapper;
+
+    /**
+     * 查询物资类型
+     *
+     * @param lockTypeId 物资类型主键
+     * @return 物资类型
+     */
+    @Override
+    public IsLockType selectIsLockTypeByLockTypeId(Long lockTypeId)
+    {
+        return isLockTypeMapper.selectIsLockTypeByLockTypeId(lockTypeId);
+    }
+
+    /**
+     * 查询物资类型列表
+     *
+     * @param isLockType 物资类型
+     * @return 物资类型
+     */
+    @Override
+    public List<IsLockType> selectIsLockTypeList(IsLockType isLockType)
+    {
+        return isLockTypeMapper.selectIsLockTypeList(isLockType);
+    }
+
+    /**
+     * 新增物资类型
+     *
+     * @param isLockType 物资类型
+     * @return 结果
+     */
+    @Override
+    public int insertIsLockType(IsLockType isLockType)
+    {
+        isLockType.setCreateTime(DateUtils.getNowDate());
+        return isLockTypeMapper.insertIsLockType(isLockType);
+    }
+
+    /**
+     * 修改物资类型
+     *
+     * @param isLockType 物资类型
+     * @return 结果
+     */
+    @Override
+    public int updateIsLockType(IsLockType isLockType)
+    {
+        isLockType.setUpdateTime(DateUtils.getNowDate());
+        return isLockTypeMapper.updateIsLockType(isLockType);
+    }
+
+    /**
+     * 批量删除物资类型
+     *
+     * @param lockTypeIds 需要删除的物资类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteIsLockTypeByLockTypeIds(String lockTypeIds)
+    {
+        Assert.notBlank(lockTypeIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(lockTypeIds);
+        return isLockTypeMapper.deleteIsLockTypeByLockTypeIds(longIds);
+    }
+
+    /**
+     * 删除物资类型信息
+     *
+     * @param lockTypeId 物资类型主键
+     * @return 结果
+     */
+    @Override
+    public int deleteIsLockTypeByLockTypeId(Long lockTypeId)
+    {
+        return isLockTypeMapper.deleteIsLockTypeByLockTypeId(lockTypeId);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -111,9 +112,13 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
         }
         int i = isMaterialsLoanMapper.insertIsMaterialsLoan(isMaterialsLoan);
         // 2.开始更新物资信息为借出状态
-        isMaterialsService.update(Wrappers.<IsMaterials>lambdaUpdate()
+        LambdaUpdateWrapper<IsMaterials> set = Wrappers.<IsMaterials>lambdaUpdate()
                 .eq(IsMaterials::getMaterialsId, isMaterialsLoan.getMaterialsId())
-                .set(IsMaterials::getLoanState, 0));
+                .set(IsMaterials::getLoanState, 0);
+        if (materials != null && materials.getAvailableTimes() != null) {
+            set.set(IsMaterials::getLoanState, materials.getAvailableTimes() - 1);
+        }
+        isMaterialsService.update(set);
         return i;
     }
 

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

@@ -20,15 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
-        <result property="lockName"    column="lock_name"    />
-        <result property="lockType"    column="lock_type"    />
-        <result property="lockImg"    column="lock_img"    />
+        <result property="lockTypeId"    column="lock_type_id"    />
     </resultMap>
 
     <sql id="selectIsIsolationPointVo">
         select point_id, point_code, point_name, point_type, workshop_id, workarea_id, power_type, isolation_method,
                point_icon, point_picture, del_flag, create_by, create_time, update_time, update_by,
-               lock_name, lock_type, lock_img
+               lock_type_id
                from is_isolation_point
     </sql>
 
@@ -66,9 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="lockName != null and lockName != ''">lock_name,</if>
-            <if test="lockType != null and lockType != ''">lock_type,</if>
-            <if test="lockImg != null and lockImg != ''">lock_img,</if>
+            <if test="lockTypeId != null and lockTypeId != ''">lock_type_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pointCode != null and pointCode != ''">#{pointCode},</if>
@@ -85,9 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="lockName != null and lockName != ''">#{lockName},</if>
-            <if test="lockType != null and lockType != ''">#{lockType},</if>
-            <if test="lockImg != null and lockImg != ''">#{lockImg},</if>
+            <if test="lockTypeId != null and lockTypeId != ''">#{lockTypeId},</if>
          </trim>
     </insert>
 
@@ -108,9 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="lockName != null and lockName != ''">lock_name = #{lockName},</if>
-            <if test="lockType != null and lockType != ''">lock_type = #{lockType},</if>
-            <if test="lockImg != null and lockImg != ''">lock_img = #{lockImg},</if>
+            <if test="lockTypeId != null and lockTypeId != ''">lock_type_id = #{lockTypeId},</if>
         </trim>
         where point_id = #{pointId}
     </update>
@@ -143,12 +135,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectIsIsolationPointByPointId" resultType="com.ktg.iscs.domain.vo.points.PointDetailVO">
         SELECT
             p.*,
-            ws.workshop_name,
-            wa.workarea_name
+            wa.workarea_name,
+            l.lock_name,
+            l.lock_type,
+            l.lock_img
         FROM
             is_isolation_point p
-                LEFT JOIN md_workshop ws ON p.workshop_id = ws.workshop_id
                 LEFT JOIN is_workarea wa ON p.workarea_id = wa.workarea_id
+                LEFT JOIN is_lock_type l ON l.lock_type_id = p.lock_type_id
         WHERE
             p.point_id = #{pointId}
     </select>

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.iscs.mapper.IsJobCardMapper">
+
+    <resultMap type="IsJobCard" id="IsJobCardResult">
+        <result property="cardId"    column="card_id"    />
+        <result property="cardCode"    column="card_code"    />
+        <result property="hardwareId"    column="hardware_id"    />
+        <result property="cardNfc"    column="card_nfc"    />
+        <result property="cardType"    column="card_type"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectIsJobCardVo">
+        select card_id, card_code, hardware_id, card_nfc, card_type, user_id, user_name, remark, del_flag, create_by, create_time, update_time, update_by from is_job_card
+    </sql>
+
+    <select id="selectIsJobCardList" parameterType="IsJobCard" resultMap="IsJobCardResult">
+        <include refid="selectIsJobCardVo"/>
+        <where>
+            <if test="cardCode != null  and cardCode != ''"> and card_code = #{cardCode}</if>
+            <if test="hardwareId != null "> and hardware_id = #{hardwareId}</if>
+            <if test="cardNfc != null  and cardNfc != ''"> and card_nfc = #{cardNfc}</if>
+            <if test="cardType != null "> and card_type = #{cardType}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectIsJobCardByCardId" parameterType="Long" resultMap="IsJobCardResult">
+        <include refid="selectIsJobCardVo"/>
+        where card_id = #{cardId}
+    </select>
+
+    <insert id="insertIsJobCard" parameterType="IsJobCard" useGeneratedKeys="true" keyProperty="cardId">
+        insert into is_job_card
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cardCode != null and cardCode != ''">card_code,</if>
+            <if test="hardwareId != null">hardware_id,</if>
+            <if test="cardNfc != null and cardNfc != ''">card_nfc,</if>
+            <if test="cardType != null">card_type,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cardCode != null and cardCode != ''">#{cardCode},</if>
+            <if test="hardwareId != null">#{hardwareId},</if>
+            <if test="cardNfc != null and cardNfc != ''">#{cardNfc},</if>
+            <if test="cardType != null">#{cardType},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIsJobCard" parameterType="IsJobCard">
+        update is_job_card
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cardCode != null and cardCode != ''">card_code = #{cardCode},</if>
+            <if test="hardwareId != null">hardware_id = #{hardwareId},</if>
+            <if test="cardNfc != null and cardNfc != ''">card_nfc = #{cardNfc},</if>
+            <if test="cardType != null">card_type = #{cardType},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where card_id = #{cardId}
+    </update>
+
+    <delete id="deleteIsJobCardByCardId" parameterType="Long">
+        delete from is_job_card where card_id = #{cardId}
+    </delete>
+
+    <delete id="deleteIsJobCardByCardIds" parameterType="String">
+        delete from is_job_card where card_id in
+        <foreach item="cardId" collection="array" open="(" separator="," close=")">
+            #{cardId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.iscs.mapper.IsLockTypeMapper">
+
+    <resultMap type="IsLockType" id="IsLockTypeResult">
+        <result property="lockTypeId"    column="lock_type_id"    />
+        <result property="lockTypeCode"    column="lock_type_code"    />
+        <result property="lockTypeName"    column="lock_type_name"    />
+        <result property="lockTypeDescription"    column="lock_type_description"    />
+        <result property="lockTypeIcon"    column="lock_type_icon"    />
+        <result property="lockTypeImg"    column="lock_type_img"    />
+        <result property="hardwareTypeId"    column="hardware_type_id"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectIsLockTypeVo">
+        select lock_type_id, lock_type_code, lock_type_name, lock_type_description, lock_type_icon, lock_type_img, hardware_type_id, remark, del_flag, create_by, create_time, update_time, update_by from is_lock_type
+    </sql>
+
+    <select id="selectIsLockTypeList" parameterType="IsLockType" resultMap="IsLockTypeResult">
+        <include refid="selectIsLockTypeVo"/>
+        <where>
+            <if test="lockTypeCode != null  and lockTypeCode != ''"> and lock_type_code = #{lockTypeCode}</if>
+            <if test="lockTypeName != null  and lockTypeName != ''"> and lock_type_name like concat('%', #{lockTypeName}, '%')</if>
+            <if test="lockTypeDescription != null  and lockTypeDescription != ''"> and lock_type_description = #{lockTypeDescription}</if>
+            <if test="lockTypeIcon != null  and lockTypeIcon != ''"> and lock_type_icon = #{lockTypeIcon}</if>
+            <if test="lockTypeImg != null  and lockTypeImg != ''"> and lock_type_img = #{lockTypeImg}</if>
+            <if test="hardwareTypeId != null "> and hardware_type_id = #{hardwareTypeId}</if>
+        </where>
+    </select>
+
+    <select id="selectIsLockTypeByLockTypeId" parameterType="Long" resultMap="IsLockTypeResult">
+        <include refid="selectIsLockTypeVo"/>
+        where lock_type_id = #{lockTypeId}
+    </select>
+
+    <insert id="insertIsLockType" parameterType="IsLockType" useGeneratedKeys="true" keyProperty="lockTypeId">
+        insert into is_lock_type
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="lockTypeCode != null and lockTypeCode != ''">lock_type_code,</if>
+            <if test="lockTypeName != null and lockTypeName != ''">lock_type_name,</if>
+            <if test="lockTypeDescription != null">lock_type_description,</if>
+            <if test="lockTypeIcon != null">lock_type_icon,</if>
+            <if test="lockTypeImg != null">lock_type_img,</if>
+            <if test="hardwareTypeId != null">hardware_type_id,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="lockTypeCode != null and lockTypeCode != ''">#{lockTypeCode},</if>
+            <if test="lockTypeName != null and lockTypeName != ''">#{lockTypeName},</if>
+            <if test="lockTypeDescription != null">#{lockTypeDescription},</if>
+            <if test="lockTypeIcon != null">#{lockTypeIcon},</if>
+            <if test="lockTypeImg != null">#{lockTypeImg},</if>
+            <if test="hardwareTypeId != null">#{hardwareTypeId},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateIsLockType" parameterType="IsLockType">
+        update is_lock_type
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="lockTypeCode != null and lockTypeCode != ''">lock_type_code = #{lockTypeCode},</if>
+            <if test="lockTypeName != null and lockTypeName != ''">lock_type_name = #{lockTypeName},</if>
+            <if test="lockTypeDescription != null">lock_type_description = #{lockTypeDescription},</if>
+            <if test="lockTypeIcon != null">lock_type_icon = #{lockTypeIcon},</if>
+            <if test="lockTypeImg != null">lock_type_img = #{lockTypeImg},</if>
+            <if test="hardwareTypeId != null">hardware_type_id = #{hardwareTypeId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where lock_type_id = #{lockTypeId}
+    </update>
+
+    <delete id="deleteIsLockTypeByLockTypeId" parameterType="Long">
+        delete from is_lock_type where lock_type_id = #{lockTypeId}
+    </delete>
+
+    <delete id="deleteIsLockTypeByLockTypeIds" parameterType="String">
+        delete from is_lock_type where lock_type_id in
+        <foreach item="lockTypeId" collection="array" open="(" separator="," close=")">
+            #{lockTypeId}
+        </foreach>
+    </delete>
+</mapper>