申请上料功能处理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -2,6 +2,7 @@ package com.github.zuihou.business.mq;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -1284,7 +1285,13 @@ public class TaskWorkNode {
             uploadInfo.put("port", productionresource.getPort());
             uploadInfo.put("data", data);
 
-            this.asyncPredictUploadFilePost(uploadInfo);
+            Object runStatus = msgUtil.redis_get("ApplyFeeding_"+ taskNode.getId());
+            if(ObjectUtil.isEmpty(runStatus)) {
+                boolean bool = this.asyncPredictUploadFilePost(uploadInfo, taskNode.getId());
+                if(bool){
+                    //msgUtil.redis_del("ApplyFeeding_"+ taskNode.getId());
+                }
+            }
         }
     }
 
@@ -1793,8 +1800,8 @@ public class TaskWorkNode {
      * @param jsonObject
      * @return
      */
-    public Boolean asyncPredictUploadFilePost(JSONObject jsonObject){
-        logger.info("====发送异步请求，允许上料请求====》"+ jsonObject);
+    public Boolean asyncPredictUploadFilePost(JSONObject jsonObject, long taskNodeId){
+        logger.warn("====发送异步请求，允许上料请求====》"+ jsonObject);
         System.out.println("====发送异步请求，允许上料请求====》"+ jsonObject);
 
         String hostSystemUrl = parameterService.getValue(ParameterKey.HOSTSYSTEMURL, null);
@@ -1803,10 +1810,11 @@ public class TaskWorkNode {
         jsonObject.put("taskNodeId", "1");
         Mono mono = webClient.post().uri("/api/PredictUploadFile").contentType(MediaType.APPLICATION_JSON)
                 .syncBody(jsonObject).retrieve().bodyToMono(String.class);
-
+        msgUtil.redis_set("ApplyFeeding_"+ taskNodeId, "1", 1, TimeUnit.HOURS);
         // 当上传不成功进行抛错处理
         if(!JSONObject.parseObject(mono.block().toString()).getBoolean("result")){
 //            throw new RuntimeException("上传nc，接受异步请求结果，上传失败：" + mono.block());
+            return false;
         }
 
         logger.info("====发送异步请求，允许上料请求====》" + mono.block());

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/RobotNodeServiceImpl.java

@@ -3,6 +3,7 @@ package com.github.zuihou.business.productionResourceCenter.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -1027,8 +1028,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
 
                 //目的地为缓存位
                 Map locationMap = new HashMap();
-                locationMap.put("location",startStore.getPointId());
-                locationMap.put("destLocation",targetStorge.getPointId());
+                locationMap.put("Location",startStore.getPointId());
+                locationMap.put("DestLocation",targetStorge.getPointId());
                 dataMap.put("data", locationMap);
                 dataMap.put("toStorge", targetStorge);
                 dataMap.put("result", true);
@@ -1105,7 +1106,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             procedureProgramList.forEach(i -> {
                 Map<String, String> m = new HashMap<>();
                 String filePath = i.getFilePath().replace(uriPath, storagePath);
-                //m.put("fileName", filePath.replace("/", "\\"));
+                //替换默认执行申请上料文件
+                filePath = filePath.replace("00.H", "O1.H");
                 m.put("fileName", filePath);
                 fileList.add(m);
             });
@@ -1122,7 +1124,13 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             uploadInfo.put("port", productionresource.getPort());
             uploadInfo.put("data", data);
 
-            this.asyncPredictUploadFilePost(uploadInfo);
+            Object runStatus = msgUtil.redis_get("ApplyFeeding_"+ taskNode.getId());
+            if(ObjectUtil.isEmpty(runStatus)) {
+              boolean bool = this.asyncPredictUploadFilePost(uploadInfo, taskNode.getId());
+              if(bool){
+                  //msgUtil.redis_del("ApplyFeeding_"+ taskNode.getId());
+              }
+            }
         }
 
     }
@@ -1132,8 +1140,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
      * @param jsonObject
      * @return
      */
-    public Boolean asyncPredictUploadFilePost(JSONObject jsonObject){
-        logger.info("====发送异步请求，允许上料请求====》"+ jsonObject);
+    public boolean asyncPredictUploadFilePost(JSONObject jsonObject, long taskNodeId){
+        logger.warn("====发送异步请求，允许上料请求====》"+ jsonObject);
         System.out.println("====发送异步请求，允许上料请求====》"+jsonObject);
 
         String hostSystemUrl = parameterService.getValue(ParameterKey.HOSTSYSTEMURL, null);
@@ -1142,12 +1150,12 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         jsonObject.put("taskNodeId", "1");
         Mono mono = webClient.post().uri("/api/PredictUploadFile").contentType(MediaType.APPLICATION_JSON)
                 .syncBody(jsonObject).retrieve().bodyToMono(String.class);
-
+        msgUtil.redis_set("ApplyFeeding_"+ taskNodeId, "1", 1, TimeUnit.HOURS);
         // 当上传不成功进行抛错处理
         if(!JSONObject.parseObject(mono.block().toString()).getBoolean("result")){
 //            throw new RuntimeException("上传nc，接受异步请求结果，上传失败：" + mono.block());
+            return false;
         }
-
         logger.info("======发送异步请求，允许上料请求返回结果======："+mono.block());
         System.out.println("======发送异步请求，允许上料请求返回结果======："+mono.block());
         return true;