Home Explore Help
Register Sign In
CQ_JD
/
read_opc
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

1

zhoupeng 2 years ago
parent
fc580d3100
commit
87e1d904cd
2 changed files with 12 additions and 6 deletions
Split View Show Diff Stats
  1. 6 3
      chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcAsyncTask.java
  2. 6 3
      chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcAsyncTask.java

+ 6 - 3
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcAsyncTask.java
View File 

@@ -312,8 +312,9 @@ public class OpcAsyncTask {
 
                             dataTimeList.add(rawData1.getDataValueTime());
 
                         }
 
                         jsonObject1.put("itemGroupId", rawData.getItemGroupId());
 
+                        jsonObject1.put("itemGroupName", itemList.get(i).getItemGroupName());
 
                         jsonObject1.put("itemName", itemList.get(i).getItemName());
 
-                        jsonObject1.put("describe", itemList.get(i).getDescribe());
 
+                        jsonObject1.put("describe", Blank.isEmpty(itemList.get(i).getDescribe()) ? itemList.get(i).getItemName() : itemList.get(i).getDescribe());
 
                         jsonObject1.put("dataList", dataList);
 
                         jsonObject1.put("dataTimeList", dataTimeList);
 
                         objects.set(i, jsonObject1);
 
@@ -326,8 +327,9 @@ public class OpcAsyncTask {
 
                                 dataTimeList.add(rawData1.getDataValueTime());
 
                             }
 
                             jsonObject1.put("itemGroupId", rawData.getItemGroupId());
 
+                            jsonObject1.put("itemGroupName", itemList.get(i).getItemGroupName());
 
                             jsonObject1.put("itemName", itemList.get(i).getItemName());
 
-                            jsonObject1.put("describe", itemList.get(i).getDescribe());
 
+                            jsonObject1.put("describe", Blank.isEmpty(itemList.get(i).getDescribe()) ? itemList.get(i).getItemName() : itemList.get(i).getDescribe());
 
                             jsonObject1.put("dataList", dataList);
 
                             jsonObject1.put("dataTimeList", dataTimeList);
 
                             objects.set(i, jsonObject1);
 
@@ -339,8 +341,9 @@ public class OpcAsyncTask {
 
                                 dataTimeList.add(rawData1.getDataValueTime());
 
                             }
 
                             jsonObject1.put("itemGroupId", rawData.getItemGroupId());
 
+                            jsonObject1.put("itemGroupName", itemList.get(i).getItemGroupName());
 
                             jsonObject1.put("itemName", itemList.get(i).getItemName());
 
-                            jsonObject1.put("describe", itemList.get(i).getDescribe());
 
+                            jsonObject1.put("describe", Blank.isEmpty(itemList.get(i).getDescribe()) ? itemList.get(i).getItemName() : itemList.get(i).getDescribe());
 
                             jsonObject1.put("dataList", dataList);
 
                             jsonObject1.put("dataTimeList", dataTimeList);
 
                             objects.set(i, jsonObject1);

+ 6 - 3
chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcAsyncTask.java
View File 

@@ -256,8 +256,9 @@ public class OpcAsyncTask {
 
                             dataTimeList.add(rawData1.getDataValueTime());
 
                         }
 
                         jsonObject1.put("itemGroupId", rawData.getItemGroupId());
 
+                        jsonObject1.put("itemGroupName", itemList.get(i).getItemGroupName());
 
                         jsonObject1.put("itemName", itemList.get(i).getItemName());
 
-                        jsonObject1.put("describe", itemList.get(i).getDescribe());
 
+                        jsonObject1.put("describe", Blank.isEmpty(itemList.get(i).getDescribe()) ? itemList.get(i).getItemName() : itemList.get(i).getDescribe());
 
                         jsonObject1.put("dataList", dataList);
 
                         jsonObject1.put("dataTimeList", dataTimeList);
 
                         objects.set(i, jsonObject1);
 
@@ -270,8 +271,9 @@ public class OpcAsyncTask {
 
                                 dataTimeList.add(rawData1.getDataValueTime());
 
                             }
 
                             jsonObject1.put("itemGroupId", rawData.getItemGroupId());
 
+                            jsonObject1.put("itemGroupName", itemList.get(i).getItemGroupName());
 
                             jsonObject1.put("itemName", itemList.get(i).getItemName());
 
-                            jsonObject1.put("describe", itemList.get(i).getDescribe());
 
+                            jsonObject1.put("describe", Blank.isEmpty(itemList.get(i).getDescribe()) ? itemList.get(i).getItemName() : itemList.get(i).getDescribe());
 
                             jsonObject1.put("dataList", dataList);
 
                             jsonObject1.put("dataTimeList", dataTimeList);
 
                             objects.set(i, jsonObject1);
 
@@ -283,8 +285,9 @@ public class OpcAsyncTask {
 
                                 dataTimeList.add(rawData1.getDataValueTime());
 
                             }
 
                             jsonObject1.put("itemGroupId", rawData.getItemGroupId());
 
+                            jsonObject1.put("itemGroupName", itemList.get(i).getItemGroupName());
 
                             jsonObject1.put("itemName", itemList.get(i).getItemName());
 
-                            jsonObject1.put("describe", itemList.get(i).getDescribe());
 
+                            jsonObject1.put("describe", Blank.isEmpty(itemList.get(i).getDescribe()) ? itemList.get(i).getItemName() : itemList.get(i).getDescribe());
 
                             jsonObject1.put("dataList", dataList);
 
                             jsonObject1.put("dataTimeList", dataTimeList);
 
                             objects.set(i, jsonObject1);