From 5da7b10deac2e87d79fd3b24d85bd0fda0e9ff7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com> Date: Thu, 21 Nov 2024 10:40:02 +0800 Subject: [PATCH] no message --- .../java/com/youchain/businessdata/domain/AgvTask.java | 4 ++-- .../youchain/businessdata/rest/AgvTaskController.java | 3 +++ .../businessdata/service/dto/AgvTaskQueryCriteria.java | 9 +++++---- .../businessdata/service/impl/AgvTaskServiceImpl.java | 1 + .../java/com/youchain/modules/quartz/task/TestTask.java | 4 ++++ .../src/main/resources/config/application.yml | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/AgvTask.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/AgvTask.java index 559b34a..ece5f20 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/domain/AgvTask.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/AgvTask.java @@ -84,7 +84,7 @@ public class AgvTask extends BaseEntity implements Serializable { private Integer jobPriority=1; @Column(name = "`job_priority_type`") - @ApiModelProperty(value = "强制优先级") + @ApiModelProperty(value = "执行时间") private Integer jobPriorityType; @Column(name = "`job_force`") @@ -112,7 +112,7 @@ public class AgvTask extends BaseEntity implements Serializable { private String lineSlotCode; @Column(name = "`job_message_time`") - @ApiModelProperty(value = "变动时间") + @ApiModelProperty(value = "执行时间") private Timestamp jobMessageTime; @Column(name = "`start_time`") diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/AgvTaskController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/AgvTaskController.java index 91c3da9..a7293aa 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/rest/AgvTaskController.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/AgvTaskController.java @@ -67,6 +67,9 @@ public class AgvTaskController { @ApiOperation("查询agvTask") @PreAuthorize("@el.check('agvTask:list')") public ResponseEntity queryAgvTask(AgvTaskQueryCriteria criteria, Pageable pageable){ + if (criteria.getJobPriorityType()!=null){ + criteria.setJobPriorityType( criteria.getJobPriorityType() * 60 * 1000); + } return new ResponseEntity<>(agvTaskService.queryAll(criteria,pageable),HttpStatus.OK); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/dto/AgvTaskQueryCriteria.java b/youchain-system/src/main/java/com/youchain/businessdata/service/dto/AgvTaskQueryCriteria.java index 93f24bd..bb6b6b0 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/dto/AgvTaskQueryCriteria.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/dto/AgvTaskQueryCriteria.java @@ -29,11 +29,11 @@ import com.youchain.annotation.Query; public class AgvTaskQueryCriteria{ /** 任务ID */ - @Query - private String id; + @Query(type = Query.Type.INNER_LIKE) + private String jobId; /** 任务组号 */ - @Query + @Query(type = Query.Type.INNER_LIKE) private String jobForce; /** 容器码 */ @@ -75,5 +75,6 @@ public class AgvTaskQueryCriteria{ /** 完成时间 */ @Query(type = Query.Type.BETWEEN) private List endTime; - + @Query(propName="jobPriorityType", type = Query.Type.GREATER_THAN) + private Integer jobPriorityType; } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java index bbfb2d3..a2ff767 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java @@ -501,6 +501,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { /* 搬运任务完成*/ agvTask.setStatus(BizStatus.FINISH); agvTask.setEndTime(new Timestamp((new Date()).getTime())); + agvTask.setJobPriorityType((int) (agvTask.getEndTime().getTime()-agvTask.getStartTime().getTime())); if (endPoint!=null) { endPoint.setAgvStatus(BaseStatus.FREE); pointRepository.save(endPoint); diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/task/TestTask.java b/youchain-system/src/main/java/com/youchain/modules/quartz/task/TestTask.java index 21bac8c..b403b3d 100644 --- a/youchain-system/src/main/java/com/youchain/modules/quartz/task/TestTask.java +++ b/youchain-system/src/main/java/com/youchain/modules/quartz/task/TestTask.java @@ -191,6 +191,10 @@ public class TestTask { }else if (st.equals("LXZ")){ /* 料箱入库*/ agvTaskService.addTaskRfid(BizStatus.RM_RK); + }else { + /* 直接关闭扫描*/ + HashSet vt = RfidDocJava.readRfid(); + throw new BadRequestException("未确定点位容器分配类型"); } try { Thread.sleep(5000); diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml index 37f08bf..6661064 100644 --- a/youchain-system/src/main/resources/config/application.yml +++ b/youchain-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: dock jackson: time-zone: GMT+8 data: