修改录入RFID数据信息

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

@@ -245,7 +245,7 @@ public class PlcServiceImpl implements PlcService {
 
             //请求CCS
             JSONObject param = new JSONObject();
-            param.put("url","10.161.10.248");
+            param.put("url","10.161.30.248");
             param.put("port","102");
             Map<String,Object> map = new HashMap();
             map.put("pointList",pointList);

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

@@ -310,20 +310,6 @@ public class TaskWorkNode {
                     log.setExeResult("0").setManual("0").setFeedback("当前任务节点为空");
                     autoNodeLogService.save(log);
                     throw new RuntimeException("当前任务节点为空");
-                }else {
-                    // 缓存到根据节点id taskNodeId 查询出零件编码，托盘编码，给rfid数据校验使用
-                    Map parMap = new HashMap();
-                    parMap.put("nodeId", taskNode.getId());
-                    List<Map> nodeDataToRfidUse = taskMapper.getNodeDataToRfidUse(parMap);
-
-                    // 因为工装夹具是两条数据，rfid只校验工装(托盘)，即没有关联查询夹具数据，查询出来有一条数据为空，需要过滤掉才能缓存到redis
-                    for (Map resultMap : nodeDataToRfidUse) {
-                        if( resultMap.get("trayNo")!=null){
-                            logger.warn("工rfid托盘校验数据缓存到redis：{}",resultMap);
-                            // 缓存到redis
-                            this.msgUtil.redis_set(DemoCacheKey.RFID+taskNode.getId(), resultMap.get("trayNo")+"&"+resultMap.get("uniqueCode"), 2L, TimeUnit.DAYS);
-                        }
-                    }
                 }
 
                 if (tTask == null || tTask.getStatus() == "3") {
@@ -526,8 +512,8 @@ public class TaskWorkNode {
                                         log.setRequestParam(jsonParam);
                                         log.setRequestUrl(instructionUrl);
                                         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/java/com/github/zuihou/business/operationManagementCenter/dao/TTaskMapper.java

@@ -68,8 +68,8 @@ public interface TTaskMapper extends SuperMapper<TTask> {
 
     /**
      * 获取节点数据，存储到redis，rfid 比对使用
-     * @param map
+     * @param nodeId
      * @return
      */
-    List<Map> getNodeDataToRfidUse(Map<String, Object> map);
+    String getNodeDataToRfidUse(Long nodeId);
 }

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

@@ -162,6 +162,9 @@ public class RobotNodeServiceImpl implements NodeOperationService {
     @Autowired
     private BomProcedureProgramMapper bomProcedureProgramMapper;
 
+    @Autowired
+    private TTaskMapper taskMapper;
+
     @Value("${zuihou.file.storage-path}")
     private String storagePath;
 
@@ -527,6 +530,19 @@ public class RobotNodeServiceImpl implements NodeOperationService {
 
                                 // 机器人移动到redis记录实时位子
                                 msgUtil.redis_set(taskNode.getResourceId()+"postion",targetStorge.getPointId());
+
+                                /**
+                                 * 塞入RFID芯片数据
+                                 */
+                                Map map=new HashMap<>();
+                                map.put("storgeId",startStore.getId());
+                                List<StockInfo> stockInfoList=stockInfoMapper.getGoodsListBystorgeId(map);
+                                String uniqueCode = taskMapper.getNodeDataToRfidUse(taskNode.getId());
+                                stockInfoList.forEach(vo->{
+                                    if("夹具".equals(vo.getCategoryDesc())){
+                                        this.msgUtil.redis_set(DemoCacheKey.RFID+taskNode.getId(), vo.getBrandNo()+"&"+uniqueCode, 2L, TimeUnit.DAYS);
+                                    }
+                                });
                             }else{
                                 log.warn("节点{}目标位置为空", taskNode.getId());
                                 dataMap.put("result", false);

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

@@ -245,7 +245,7 @@ public class ToolRobotNodeServiceImpl implements ToolNodeOperationService {
             msgUtil.redis_set(YunjianConstant.TOOL_CALLBACK_PARAM + "_" + toolTaskExecute.getId(),callBackParam.toString(),10,TimeUnit.DAYS);
 
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("url", "10.161.10.248");
+            jsonObject.put("url", "10.161.30.248");
             jsonObject.put("port", "102");
             jsonObject.put("taskId", toolTaskExecute.getToolTaskId());
             jsonObject.put("taskNodeId", toolTaskExecute.getId()); //为了和托盘保持一致，实际取的是执行表的ID
@@ -266,7 +266,7 @@ public class ToolRobotNodeServiceImpl implements ToolNodeOperationService {
             //拍照
             //请求CCS
             JSONObject param = new JSONObject();
-            param.put("url","10.161.10.248");
+            param.put("url","10.161.30.248");
             param.put("port","102");
             param.put("taskId",toolTaskExecute.getToolTaskId());
             param.put("taskNodeId",toolTaskExecute.getId());

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -441,20 +441,13 @@
 
 <!--    </select>-->
 
-    <select id="getNodeDataToRfidUse" parameterType="java.util.Map" resultType="java.util.Map">
+    <select id="getNodeDataToRfidUse" parameterType="java.util.Map" resultType="java.lang.String">
         SELECT
-            itask.id taskId,
-            itask.procedure_name procedureName,
-            ittn.node_name nodeName,
-            ittn.id taskNodeId,
-            itt.`name` trayName,
-            itt.`no` trayNo,
+            DISTINCT
             itw.unique_code uniqueCode
         FROM
             imcs_t_task itask
                 LEFT JOIN imcs_t_task_node ittn ON itask.id = ittn.task_id
-                LEFT JOIN imcs_b_bom_procedure_tray ibbp  ON ittn.procedure_id = ibbp.procedure_id
-                LEFT JOIN imcs_m_frock_clamp itt ON itt.id = ibbp.tray_id
                 LEFT JOIN imcs_t_workpiece itw ON itw.complete_batch_no = ittn.complete_batch_no
         WHERE ittn.id = ${nodeId};
     </select>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/MeasuringController.java

@@ -155,9 +155,9 @@ public class MeasuringController extends SuperController<OrderQualityService, Lo
         Map map = new HashMap();
         map.put("nodeId", nodeid);
         BaseContextHandler.setTenant("0000");
-        List<Map> nodeDataToRfidUse = tTaskMapper.getNodeDataToRfidUse(map);
+        //List<Map> nodeDataToRfidUse = tTaskMapper.getNodeDataToRfidUse(map);
 
-        for (Map map1 : nodeDataToRfidUse) {
+        /*for (Map map1 : nodeDataToRfidUse) {
            if( map1.get("trayNo")!=null){
                log.info("缓存到redis中给rfig使用，失效时间，2day"+  map1);
                // 创建 ObjectMapper 实例
@@ -176,9 +176,9 @@ public class MeasuringController extends SuperController<OrderQualityService, Lo
                Object o = this.msgUtil.redis_get(DemoCacheKey.RFID + "222");
 
            }
-        }
+        }*/
 
-        log.info("nodeDataToRfidUse========={}", JSONArray.toJSONString(nodeDataToRfidUse));
+        //log.info("nodeDataToRfidUse========={}", JSONArray.toJSONString(nodeDataToRfidUse));
 
     }
 }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/ToolbarController.java

@@ -141,7 +141,7 @@ public class ToolbarController {
 
         //取托盘
         JSONObject param = new JSONObject();
-        param.put("url","10.161.10.248");
+        param.put("url","10.161.30.248");
         param.put("port","102");
 
         Map<String,Object> map = new HashMap<>();
@@ -204,7 +204,7 @@ public class ToolbarController {
 
         //取托盘
         JSONObject param = new JSONObject();
-        param.put("url","10.161.10.248");
+        param.put("url","10.161.30.248");
         param.put("port","102");
 
         Map<String,Object> map = new HashMap<>();

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/DictionaryKey.java

@@ -163,9 +163,9 @@ public interface DictionaryKey {
     Map<String, Map<String, String>> PLC_CATEGORY = new HashMap<String, Map<String, String>>(){
         {
             // 云箭配置
-            put("capsule", new HashMap<String,String>(){{put("url", "10.161.10.248");put("port", "102");}});
-            put("framework", new HashMap<String,String>(){{put("url", "10.161.10.248");put("port", "102");}});
-            put("safeguard", new HashMap<String,String>(){{put("url", "10.161.10.248");put("port", "102");}});
+            put("capsule", new HashMap<String,String>(){{put("url", "10.161.30.248");put("port", "102");}});
+            put("framework", new HashMap<String,String>(){{put("url", "10.161.30.248");put("port", "102");}});
+            put("safeguard", new HashMap<String,String>(){{put("url", "10.161.30.248");put("port", "102");}});
 
             // 示范线配置
 //            put("capsule", new HashMap<String,String>(){{put("url", "192.168.170.71");put("port", "102");}});