模拟锁控柜加数据返回

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/jobticket/vo/JobTicketKeyRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 作业票钥匙 Response VO")
 @Data
@@ -56,4 +56,8 @@ public class JobTicketKeyRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "钥匙nfc", example = "3195qw6")
+    @ExcelProperty("钥匙nfc")
+    private String keyNfc;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/jobticket/JobTicketKeyMapper.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.jobticket.JobTicketKeyDO;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -45,4 +46,6 @@ public interface JobTicketKeyMapper extends BaseMapperX<JobTicketKeyDO> {
     })
     Boolean physicalDeleteByIds(@Param(value = "ids") List<Long> ids);
 
+    List<JobTicketKeyRespVO> getListByTicketId(@Param(value = "ticketId") Long ticketId);
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/hardwareapi/HardwareApiServiceImpl.java

@@ -780,9 +780,10 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         Assert.notNull(isJobTicket, "作业票信息丢失！");
         JobTicketRespVO jobTicketVO = BeanUtils.toBean(isJobTicket, JobTicketRespVO.class);
         // 2.查询钥匙数据
-        List<JobTicketKeyDO> ticketKeyList = iIsJobTicketKeyService.list(Wrappers.<JobTicketKeyDO>lambdaQuery()
+        /*List<JobTicketKeyDO> ticketKeyList = iIsJobTicketKeyService.list(Wrappers.<JobTicketKeyDO>lambdaQuery()
                 .eq(JobTicketKeyDO::getTicketId, ticketId));
-        List<JobTicketKeyRespVO> ticketKeyVOList = BeanUtils.toBean(ticketKeyList, JobTicketKeyRespVO.class);
+        List<JobTicketKeyRespVO> ticketKeyVOList = BeanUtils.toBean(ticketKeyList, JobTicketKeyRespVO.class);*/
+        List<JobTicketKeyRespVO> ticketKeyVOList = iIsJobTicketKeyService.getListByTicketId(ticketId);
         // 3.查询挂锁数据
         List<JobTicketLockRespVO> ticketLockVOList = iIsJobTicketLockService.getTicketLockByTicketId(ticketId);
         // 4.查询辅件数据

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/jobticket/JobTicketKeyService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.jobticket;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeySaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.jobticket.JobTicketKeyDO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -54,4 +55,7 @@ public interface JobTicketKeyService extends IService<JobTicketKeyDO> {
      */
     PageResult<JobTicketKeyDO> getJobTicketKeyPage(JobTicketKeyPageReqVO pageReqVO);
 
+
+    List<JobTicketKeyRespVO> getListByTicketId(Long ticketId);
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/jobticket/JobTicketKeyServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iscs.service.jobticket;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeySaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.jobticket.JobTicketKeyDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.jobticket.JobTicketKeyMapper;
@@ -69,4 +70,9 @@ public class JobTicketKeyServiceImpl extends ServiceImpl<JobTicketKeyMapper, Job
         return jobTicketKeyMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<JobTicketKeyRespVO> getListByTicketId(Long ticketId) {
+        return jobTicketKeyMapper.getListByTicketId(ticketId);
+    }
+
 }

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

@@ -9,4 +9,14 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="getListByTicketId"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.jobticket.vo.JobTicketKeyRespVO">
+        SELECT
+            tk.*,
+            k.key_name
+        FROM
+            isc_job_ticket_key tk
+                LEFT JOIN isc_key k ON k.id = tk.key_id
+        where tk.ticket_id = #{ticketId}
+    </select>
 </mapper>