fix: 优化日志运行消息

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

@@ -631,10 +631,10 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
         JSONObject params = new JSONObject();
         //三坐标中间位取操作
         if(isFetched) {
-            //todo wang.sq三坐标调用地址释放
+            //todo wang.sq三坐标调用地址释放, $需要换地址$
             // 查询三坐标是否允许取
-            String fetchStatus = msgUtil.getCcsData("/api/GetMiddleThreeCoordinates", params, taskNode);
-            //String fetchStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线：192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
+            //String fetchStatus = msgUtil.getCcsData("/api/GetMiddleThreeCoordinates", params, taskNode);
+            String fetchStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线：192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
 
             JSONObject fetchObject = JSONObject.parseObject(fetchStatus);
             logger.warn("三坐标节点{}取查询接口返回{}", taskNode.getId(), fetchObject.toJSONString());
@@ -655,9 +655,9 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
         }else{
             //三坐标中间放操作
             // 查询三坐标是否允许放
-            //todo wang.sq三坐标调用地址释放
-            String sendStatus = msgUtil.getCcsData("/api/QueryThreeCoordinatesFreePos", params, taskNode);
-            //String sendStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线：192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
+            //todo wang.sq三坐标调用地址释放$需要换地址$
+            //String sendStatus = msgUtil.getCcsData("/api/QueryThreeCoordinatesFreePos", params, taskNode);
+            String sendStatus = "{\"taskID\":null,\"taskNodeID\":null,\"result\":\"true\",\"resultMsg\":\"设备已离线：192.168.0.10\",\"concurrency\":\"false\",\"data\":null}";
 
             JSONObject sendObject = JSONObject.parseObject(sendStatus);
             logger.warn("三坐标节点{}放查询接口返回{}", taskNode.getId(), sendObject.toJSONString());

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

@@ -597,9 +597,10 @@ public class TaskWorkNode {
                                                     log.setEndStorge(tstorge.getName());
                                                 }
 
+                                                //todo $需要换地址$
                                                 HttpEntity<String> formEntity = new HttpEntity<String>(jsonParam, headers);
-                                                returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
-                                                //returnData = "{\"result\": \"true\"}";
+                                                //returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
+                                                returnData = "{\"result\": \"true\"}";
                                             }
 
                                         }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AAutoNodeLogMapper.xml

@@ -48,6 +48,9 @@
 
     <select id="selectLogs" resultType="com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog">
         SELECT
+            ittn.complete_batch_no,
+            ioo.order_name,-- 订单名称
+            itw.unique_code,-- 零件编码
             aanl.id,
             aanl.start_storge,
             aanl.end_storge,
@@ -55,16 +58,24 @@
             aanl.execute_time,-- 执行时间
             aanl.exe_status,-- 执行状态
             aanl.exe_result,-- 执行结果
-            aanl.send_status, -- 发送状态
-            aanl.status, -- 是否人工处理
-            aanl.manual, -- 是否人工处理（0-否  1-是)
+            aanl.send_status,-- 发送状态
+            aanl.STATUS,-- 是否人工处理
+            aanl.manual,-- 是否人工处理（0-否  1-是)
             aanl.feedback,-- 运行时信息
             aanl.task_id,-- 任务id
-            aanl.task_node_id-- 任务节点ID
+            aanl.task_node_id -- 任务节点ID
+
         FROM
             imcs_a_auto_node_log aanl
+                LEFT JOIN imcs_o_order ioo ON ioo.id = aanl.order_id
+                LEFT JOIN imcs_t_task_node ittn ON ittn.id = aanl.task_node_id
+                LEFT JOIN imcs_t_workpiece itw ON itw.complete_batch_no = ittn.complete_batch_no
         ORDER BY
-            aanl.exe_status ASC,aanl.create_time DESC , aanl.id DESC
+            aanl.order_id DESC,
+            ittn.complete_batch_no DESC,
+            aanl.create_time DESC,
+            aanl.exe_status ASC,
+            aanl.id DESC
     </select>
 
 </mapper>

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AAutoNodeLog.java

@@ -258,6 +258,18 @@ public class AAutoNodeLog extends Entity<Long> {
     @TableField(exist = false)
     private String nodeNo;
 
+    /**
+     * 订单名称
+     */
+    @TableField(exist = false)
+    private String orderName;
+
+    /**
+     * 零件编码
+     */
+    @TableField(exist = false)
+    private String uniqueCode;
+
 
     /**
      * 设备分类