Browse Source

编写紧急任务下发接口

zhifei 1 year ago
parent
commit
18120957ad

File diff suppressed because it is too large
+ 864 - 41
ruoyi-admin/src/test/java/com/ruoyi/admin/test/base/WarehouseTest.java


+ 65 - 0
warewms-base/src/main/java/com/ruoyi/base/domain/dto/CarInfoBo.java

@@ -0,0 +1,65 @@
+package com.ruoyi.base.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 车辆信息对象 car_info
+ *
+ * @author ruoyi
+ * @date 2023-09-19
+ */
+@Data
+@NoArgsConstructor
+public class CarInfoBo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 车编号 */
+    @Excel(name = "车编号")
+    private Long carno;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private Long warehouseId;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String state;
+
+    /** 是否启用 */
+    @Excel(name = "是否启用")
+    private String activeFlag;
+
+    /** $column.columnComment */
+    private String userdefine1;
+
+    /** $column.columnComment */
+    private String userdefine2;
+
+    /** $column.columnComment */
+    private String userdefine3;
+
+    /** $column.columnComment */
+    private String userdefine4;
+
+    /** $column.columnComment */
+    private String userdefine5;
+
+    /** 电池 */
+    @Excel(name = "电池")
+    private Long battery;
+
+    /** x轴 */
+    private Long x;
+
+    /** y轴 */
+    private Long y;
+
+    private String updateType;
+}

+ 65 - 0
warewms-base/src/main/java/com/ruoyi/base/domain/dto/CarInfoDTO.java

@@ -0,0 +1,65 @@
+package com.ruoyi.base.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 车辆信息对象 car_info
+ *
+ * @author ruoyi
+ * @date 2023-09-19
+ */
+@Data
+@NoArgsConstructor
+public class CarInfoDTO extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 车编号 */
+    @Excel(name = "车编号")
+    private Long carno;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private Long warehouseId;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String state;
+
+    /** 是否启用 */
+    @Excel(name = "是否启用")
+    private String activeFlag;
+
+    /** $column.columnComment */
+    private String userdefine1;
+
+    /** $column.columnComment */
+    private String userdefine2;
+
+    /** $column.columnComment */
+    private String userdefine3;
+
+    /** $column.columnComment */
+    private String userdefine4;
+
+    /** $column.columnComment */
+    private String userdefine5;
+
+    /** 电池 */
+    @Excel(name = "电池")
+    private Long battery;
+
+    /** x轴 */
+    private Long x;
+
+    /** y轴 */
+    private Long y;
+
+    private String updateType;
+}

+ 11 - 4
warewms-tianao/src/main/java/com/ruoyi/tianao/service/impl/TianaoServiceImpl.java

@@ -449,7 +449,16 @@ public class TianaoServiceImpl implements TianaoService {
      */
     @Override
     public JSONObject addUrgentTask(TianaoTask tianaoTask) {
-        return null;
+        if (redisCache.checkIsLock(tianaoTask.getLcs_task_id())){
+            return returnJson("e0001", "任务Id已重复", "fail");
+        }
+        List<WcsTask> wcsTaskList = wcsTaskMapper.selectWcsTaskByLcsTaskId(tianaoTask.getLcs_task_id());
+        if (ObjectUtil.isNotNull(wcsTaskList) && !wcsTaskList.isEmpty()) {
+            return returnJson("e0001", "任务Id已重复", "fail");
+        }
+
+        redisCache.setCacheObject(tianaoTask.getLcs_task_id(), tianaoTask.getLcs_task_id(), 30, TimeUnit.SECONDS);
+        return returnJson("00000", "任务发起成功", "ok");
     }
 
 
@@ -494,9 +503,7 @@ public class TianaoServiceImpl implements TianaoService {
                     }
                     return true;
                 });
-            } catch (ExecutionException e) {
-                throw new RuntimeException(e);
-            } catch (RetryException e) {
+            } catch (ExecutionException | RetryException e) {
                 throw new RuntimeException(e);
             }
         });