From 8e210282102b8808d8e7ea218368f1d41f448eb4 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 七月 2024 16:14:07 +0800
Subject: [PATCH] 修改UUID

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java          |    4 ++--
 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 604b00f..42bbb7c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -88,8 +88,8 @@
                 collectionParamConfService,
                 daParamCollectionService,
                 omProductionOrdeInfoService,
-                daTestDeviceInterfaceTempService,
-                daCellDataService);
+                daTestDeviceInterfaceTempService/*,
+                daCellDataService*/);
 
         List<String> lists = getSubList();
         System.out.println("璁㈤槄鍐呭锛�"+lists);
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 1fd42d9..998102a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -746,11 +746,10 @@
                     ParentVO parentVO = new ParentVO();
                     parentVO.setStationCode(device);//宸ヤ綅
                     parentVO.setSiteCode("3983");
-
-                    parentVO.setRecordId(UUID.randomUUID().toString());
-                    parentVO.setTotalResult("1");
                     for (int i = 0; i < cellCodeList.size(); i++) {//寰幆4涓數鑺�
                         if(!cellCodeList.get(i).isEmpty()){
+                            parentVO.setRecordId(UUID.randomUUID().toString());
+                            parentVO.setTotalResult("1");
                             parentVO.setProductNum(cellCodeList.get(i));//鐢佃姱鐮�
                             //灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4
                             List<ChildVO> mesChildList = new ArrayList<>(mesChildList0);

--
Gitblit v1.9.3