no message

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`")

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<Object> queryAgvTask(AgvTaskQueryCriteria criteria, Pageable pageable){
+        if (criteria.getJobPriorityType()!=null){
+            criteria.setJobPriorityType( criteria.getJobPriorityType() * 60 * 1000);
+        }
         return new ResponseEntity<>(agvTaskService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 

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<Timestamp> endTime;
-
+    @Query(propName="jobPriorityType", type = Query.Type.GREATER_THAN)
+    private Integer jobPriorityType;
 }

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);

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);

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: