Browse Source

完成异步方法,将临时事件驱动数据,转换成报表,事件驱动在异步任务,还有待考略

zhoupeng 2 năm trước cách đây
mục cha
commit
9d2e5c9d70

+ 4 - 0
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/dao/RawDataDao.java

@@ -31,4 +31,8 @@ public interface RawDataDao {
     Integer addTempRawData(RawData rawData);
 
     RawData getRawDataList(Item item, Integer remainder, Integer dataSourceId, String valueBelongTime);
+
+    List<RawData> getEventRawDataList(Item item, Integer remainder, Integer dataSourceId, String valueBelongTime);
+
+    Integer addEventRawData(RawData rawData);
 }

+ 22 - 107
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcAsyncTask.java

@@ -56,13 +56,6 @@ public class OpcAsyncTask {
     private String opcUaUrl;
 
     /**
-     * 异步生成事件驱动报表
-     */
-    public void eventDiverReport() {
-
-    }
-
-    /**
      * 新增一条临时数据
      *
      * @param rawData
@@ -189,22 +182,9 @@ public class OpcAsyncTask {
         }
     }
 
-    public void addEventRawData(Integer id, RawData rawData) {
-        if (Blank.isNotEmpty(id) && Blank.isNotEmpty(rawData)) {
-            Integer remainder = id % ConstantStr.SUB_TABLE_NUM;
-//            rawDataDao.addRawData(id, remainder, rawData);
-        }
-    }
-
-    /**
-     * 新增原始数据集合
-     *
-     * @param rawDataList
-     */
-    public void addRawDataList(Integer id, List<RawData> rawDataList) {
-        if (Blank.isNotEmpty(id) && Blank.isNotEmpty(rawDataList)) {
-            Integer remainder = id % ConstantStr.SUB_TABLE_NUM;
-            rawDataDao.addRawDataList(id, remainder, rawDataList);
+    public void addEventRawData( RawData rawData) {
+        if ( Blank.isNotEmpty(rawData)) {
+            rawDataDao.addEventRawData(rawData);
         }
     }
 
@@ -271,85 +251,7 @@ public class OpcAsyncTask {
     /**
      * 事件驱动报表异步添加数据
      */
-    public void eventTable(Integer tableReportId, BigDecimal value, String currentDate) {
-        ReportTable reportTable = reportTableDao.getReportTableById(tableReportId);
-        String reportTableData = reportTable.getReportTableData();
-        JSONObject jsonObject = JSONObject.parseObject(reportTableData);
-        JSONArray objects = jsonObject.getJSONArray("tables");
-        if (Blank.isNotEmpty(objects)) {
-            JSONObject jsonObject1 = objects.getJSONObject(0);
-            JSONArray objects1 = jsonObject1.getJSONArray("eventDataList");
-            JSONObject object = new JSONObject();
-            object.put("date", currentDate);
-            object.put("value", value);
-            objects1.add(object);
-            objects.set(0, jsonObject1);
-            jsonObject.put("tables", objects);
-            reportTable.setReportTableData(jsonObject.toJSONString());
-            //将新数据加到与那里的data里面,并更新
-            reportTableDao.updateReportTable(reportTable);
-        }
-    }
-
-    public void addEventTable(Integer tableReportId, List<BigDecimal> eventDataValueList, List<String> eventDataValueTimeList) {
-        ReportTable reportTable = reportTableDao.getReportTableById(tableReportId);
-        String reportTableData = reportTable.getReportTableData();
-        JSONObject jsonObject = JSONObject.parseObject(reportTableData);
-        JSONArray objects = jsonObject.getJSONArray("tables");
-        if (Blank.isEmpty(objects)) {
-            ReportTable reportTable1 = new ReportTable();
-            reportTable1.setTableTemplateId(reportTable.getTableTemplateId());
-            reportTable1.setUserId(reportTable.getUserId());
-            reportTable1.setReportTableName(reportTable.getReportTableName() + "_" + DateUtil.dateChangeStr(new Date(), "yyyyMMddHHmmss"));
-            reportTable1.setReportTableData(jsonObject.toJSONString());
-            reportTable1.setReportValueFormat(reportTable.getReportValueFormat());
-            reportTable1.setIsAutoReport(ConstantStr.EVENT_GENERATE_REPORT);
-            reportTable1.setVersion(reportTable.getVersion());
-            reportTableDao.addReportTable(reportTable1);
-            TableAutoLog tableAutoLog = new TableAutoLog();
-            tableAutoLog.setAutoTableId(reportTable.getId());
-            tableAutoLog.setAutoChTableId(reportTable1.getId());
-            reportTableDao.addTableAutoLog(tableAutoLog);
-            if (Blank.isNotEmpty(reportTable.getUserGroupList())) {
-                reportTableDao.addTableUserGroup(reportTable1.getId(), reportTable.getUserGroupList());
-            }
-            return;
-        }
-        JSONObject jsonObject1 = objects.getJSONObject(0);
-        JSONArray objects1 = jsonObject1.getJSONArray("item");
-        JSONObject jsonObject2 = new JSONObject();
-        jsonObject2.put("dataList", eventDataValueList);
-        jsonObject2.put("dataTimeList", eventDataValueTimeList);
-        objects1.set(0, jsonObject2);
-        objects.set(0, jsonObject1);
-        jsonObject.put("tables", objects);
-        ReportTable reportTable1 = new ReportTable();
-        reportTable1.setTableTemplateId(reportTable.getTableTemplateId());
-        reportTable1.setUserId(reportTable.getUserId());
-        reportTable1.setReportTableName(reportTable.getReportTableName() + "_" + DateUtil.dateChangeStr(new Date(), "yyyyMMddHHmmss"));
-        reportTable1.setReportTableData(jsonObject.toJSONString());
-        reportTable1.setReportValueFormat(reportTable.getReportValueFormat());
-        reportTable1.setIsAutoReport(ConstantStr.EVENT_GENERATE_REPORT);
-        reportTable1.setVersion(reportTable.getVersion());
-        reportTableDao.addReportTable(reportTable1);
-        TableAutoLog tableAutoLog = new TableAutoLog();
-        tableAutoLog.setAutoTableId(reportTable.getId());
-        tableAutoLog.setAutoChTableId(reportTable1.getId());
-        reportTableDao.addTableAutoLog(tableAutoLog);
-        if (Blank.isNotEmpty(reportTable.getUserGroupList())) {
-            reportTableDao.addTableUserGroup(reportTable1.getId(), reportTable.getUserGroupList());
-        }
-    }
-
-    public void addEventTable1(Integer tableReportId, Integer itemGroupId, Map<String, JSONObject> map) {
-        for (String item : map.keySet()) {
-            JSONObject jsonObject = map.get(item);
-            Object dataList = jsonObject.get("dataList");
-            Object dataTimeList = jsonObject.get("dataTimeList");
-        }
-    }
-
-    public void addEventTable2(Integer dataSourceId, Integer tableReportId, List<Item> itemList, String sqlCurrentYmdh) {
+    public void eventTable(Integer dataSourceId, Integer tableReportId, List<Item> itemList, String sqlCurrentYmdh) {
         ReportTable reportTable = reportTableDao.getReportTableById(tableReportId);
         String reportTableData = reportTable.getReportTableData();
         JSONObject jsonObject = JSONObject.parseObject(reportTableData);
@@ -380,17 +282,30 @@ public class OpcAsyncTask {
             Integer itemGroupId = item.getItemGroupId();
             Integer remainder = itemGroupId % ConstantStr.SUB_TABLE_NUM;
             for (int i = 0; i < itemList.size(); i++) {
-                RawData rawData = rawDataDao.getRawDataList(itemList.get(i), remainder, dataSourceId, sqlCurrentYmdh);
-                if (Blank.isNotEmpty(rawData)) {
+                List<RawData> rawDataList = rawDataDao.getEventRawDataList(itemList.get(i), remainder, dataSourceId, sqlCurrentYmdh);
+                if (Blank.isNotEmpty(rawDataList)) {
                     JSONObject jsonObject2 = new JSONObject();
+                    RawData rawData = rawDataList.get(0);
                     String dataType = rawData.getDataType();
                     if (dataType.toLowerCase().equals("boolean")) {
-                        jsonObject2.put("dataList", JSON.parseObject(rawData.getDataValueTime(), Boolean[].class));
+                        List<Boolean> dataList = new ArrayList<>();
+                        for (RawData rawData1 : rawDataList) {
+                            dataList.add(JSON.parseObject(rawData1.getDataValue(), Boolean.class));
+                        }
+                        jsonObject2.put("dataList", dataList);
                     } else {
                         try {
-                            jsonObject2.put("dataList", JSON.parseObject(rawData.getDataValueTime(), BigDecimal[].class));
+                            List<BigDecimal> dataList = new ArrayList<>();
+                            for (RawData rawData1 : rawDataList) {
+                                dataList.add(JSON.parseObject(rawData1.getDataValue(), BigDecimal.class));
+                            }
+                            jsonObject2.put("dataList", dataList);
                         } catch (Exception e) {
-                            jsonObject2.put("dataList", JSON.parseObject(rawData.getDataValueTime(), String[].class));
+                            List<String> dataList = new ArrayList<>();
+                            for (RawData rawData1 : rawDataList) {
+                                dataList.add(rawData1.getDataValue());
+                            }
+                            jsonObject2.put("dataList", dataList);
                         }
                     }
                     jsonObject2.put("dataTimeList", JSON.parseObject(rawData.getDataValueTime(), String[].class));

+ 6 - 6
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaChangeTask.java

@@ -114,14 +114,14 @@ public class OpcDaChangeTask extends TimerTask {
                                         if (eventMode.equals(ConstantStr.EVENT_MODEL_BOOLEAN)) {
                                             if ((dmData ? ConstantStr.BOOLEAN_TRUE : ConstantStr.BOOLEAN_FALSE).equals(eventValue.intValue())) {
                                                 eventFlage = true;
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             } else {
                                                 eventFlage = false;
                                             }
                                         }
                                     } else {
                                         if (eventFlage) {
-                                            opcAsyncTask.addEventRawData(id, rawData);
+                                            opcAsyncTask.addEventRawData(rawData);
                                         }
                                     }
                                 } else {
@@ -139,21 +139,21 @@ public class OpcDaChangeTask extends TimerTask {
                                             if (eventMode.equals(ConstantStr.EVENT_MODEL_EXCEED)) {
                                                 if (dmData.compareTo(bigEventValue) == 1) {
                                                     eventFlage = true;
-                                                    opcAsyncTask.addEventRawData(id, rawData);
+                                                    opcAsyncTask.addEventRawData(rawData);
                                                 } else {
                                                     eventFlage = false;
                                                 }
                                             } else if (eventMode.equals(ConstantStr.EVENT_MODEL_LOWER)) {
                                                 if (dmData.compareTo(bigEventValue) == -1) {
                                                     eventFlage = true;
-                                                    opcAsyncTask.addEventRawData(id, rawData);
+                                                    opcAsyncTask.addEventRawData(rawData);
                                                 } else {
                                                     eventFlage = false;
                                                 }
                                             }
                                         } else {
                                             if (eventFlage) {
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             }
                                         }
                                     } catch (Exception e) {
@@ -163,7 +163,7 @@ public class OpcDaChangeTask extends TimerTask {
 
                                         if (Blank.isEmpty(eventMode, eventValue, tableReportId)) {
                                             if (eventFlage) {
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             }
                                         }
                                     }

+ 14 - 14
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaExceedTask.java

@@ -41,14 +41,14 @@ public class OpcDaExceedTask extends TimerTask {
     private Boolean eventFlage = false;
 
     public OpcDaExceedTask(RedisUtil redisUtil,
-                            OpcAsyncTask opcAsyncTask,
-                            ItemGroupDao itemGroupDao,
-                            MessageNoticeDao messageNoticeDao,
-                            Timer timer,
-                            ItemGroup itemGroup,
-                            DataSource dataSource,
-                            Map<String, DataModel> map,
-                            List<com.example.opc_common.entity.Item> itemList, String timeFormat) {
+                           OpcAsyncTask opcAsyncTask,
+                           ItemGroupDao itemGroupDao,
+                           MessageNoticeDao messageNoticeDao,
+                           Timer timer,
+                           ItemGroup itemGroup,
+                           DataSource dataSource,
+                           Map<String, DataModel> map,
+                           List<com.example.opc_common.entity.Item> itemList, String timeFormat) {
         this.redisUtil = redisUtil;
         this.opcAsyncTask = opcAsyncTask;
         this.itemGroupDao = itemGroupDao;
@@ -97,7 +97,7 @@ public class OpcDaExceedTask extends TimerTask {
                             } else {
                                 if (!sqlCurrentYmdh.equals(currentYmdh)) {
                                     //组装相应的数据
-                                    opcAsyncTask.packageRawData(item, dataSourceId,sqlCurrentYmdh);
+                                    opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
                                     redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
                                 }
                             }
@@ -117,21 +117,21 @@ public class OpcDaExceedTask extends TimerTask {
                                             if (eventMode.equals(ConstantStr.EVENT_MODEL_EXCEED)) {
                                                 if (dmData.compareTo(bigEventValue) == 1) {
                                                     eventFlage = true;
-                                                    opcAsyncTask.addEventRawData(id, rawData);
+                                                    opcAsyncTask.addEventRawData(rawData);
                                                 } else {
                                                     eventFlage = false;
                                                 }
                                             } else if (eventMode.equals(ConstantStr.EVENT_MODEL_LOWER)) {
                                                 if (dmData.compareTo(bigEventValue) == -1) {
                                                     eventFlage = true;
-                                                    opcAsyncTask.addEventRawData(id, rawData);
+                                                    opcAsyncTask.addEventRawData(rawData);
                                                 } else {
                                                     eventFlage = false;
                                                 }
                                             }
                                         } else {
                                             if (eventFlage) {
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             }
                                         }
                                     }
@@ -141,7 +141,7 @@ public class OpcDaExceedTask extends TimerTask {
                             }
                         } catch (Exception e) {
                             //执行组装数据库的数据,以及生成驱动报表
-                            opcAsyncTask.packageRawDataList(itemList,dataSourceId, sqlCurrentYmdh);
+                            opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
                             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -168,7 +168,7 @@ public class OpcDaExceedTask extends TimerTask {
                 if (!flage) {
                     //执行组装数据库的数据,以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
-                    opcAsyncTask.packageRawDataList(itemList,dataSourceId, sqlCurrentYmdh);
+                    opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
                     redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                     messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

+ 6 - 6
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaFrequencyTask.java

@@ -114,14 +114,14 @@ public class OpcDaFrequencyTask extends TimerTask {
                                     if (eventMode.equals(ConstantStr.EVENT_MODEL_BOOLEAN)) {
                                         if ((dmData ? ConstantStr.BOOLEAN_TRUE : ConstantStr.BOOLEAN_FALSE).equals(eventValue.intValue())) {
                                             eventFlage = true;
-                                            opcAsyncTask.addEventRawData(id, rawData);
+                                            opcAsyncTask.addEventRawData(rawData);
                                         } else {
                                             eventFlage = false;
                                         }
                                     }
                                 } else {
                                     if (eventFlage) {
-                                        opcAsyncTask.addEventRawData(id, rawData);
+                                        opcAsyncTask.addEventRawData(rawData);
                                     }
                                 }
                             } else {
@@ -139,21 +139,21 @@ public class OpcDaFrequencyTask extends TimerTask {
                                         if (eventMode.equals(ConstantStr.EVENT_MODEL_EXCEED)) {
                                             if (dmData.compareTo(bigEventValue) == 1) {
                                                 eventFlage = true;
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             } else {
                                                 eventFlage = false;
                                             }
                                         } else if (eventMode.equals(ConstantStr.EVENT_MODEL_LOWER)) {
                                             if (dmData.compareTo(bigEventValue) == -1) {
                                                 eventFlage = true;
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             } else {
                                                 eventFlage = false;
                                             }
                                         }
                                     } else {
                                         if (eventFlage) {
-                                            opcAsyncTask.addEventRawData(id, rawData);
+                                            opcAsyncTask.addEventRawData(rawData);
                                         }
                                     }
                                 } catch (Exception e) {
@@ -163,7 +163,7 @@ public class OpcDaFrequencyTask extends TimerTask {
 
                                     if (Blank.isEmpty(eventMode, eventValue, tableReportId)) {
                                         if (eventFlage) {
-                                            opcAsyncTask.addEventRawData(id, rawData);
+                                            opcAsyncTask.addEventRawData(rawData);
                                         }
                                     }
                                 }

+ 6 - 6
chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaLowseTask.java

@@ -97,7 +97,7 @@ public class OpcDaLowseTask extends TimerTask {
                             } else {
                                 if (!sqlCurrentYmdh.equals(currentYmdh)) {
                                     //组装相应的数据
-                                    opcAsyncTask.packageRawData(item,dataSourceId, sqlCurrentYmdh);
+                                    opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
                                     redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
                                 }
                             }
@@ -117,21 +117,21 @@ public class OpcDaLowseTask extends TimerTask {
                                             if (eventMode.equals(ConstantStr.EVENT_MODEL_EXCEED)) {
                                                 if (dmData.compareTo(bigEventValue) == 1) {
                                                     eventFlage = true;
-                                                    opcAsyncTask.addEventRawData(id, rawData);
+                                                    opcAsyncTask.addEventRawData(rawData);
                                                 } else {
                                                     eventFlage = false;
                                                 }
                                             } else if (eventMode.equals(ConstantStr.EVENT_MODEL_LOWER)) {
                                                 if (dmData.compareTo(bigEventValue) == -1) {
                                                     eventFlage = true;
-                                                    opcAsyncTask.addEventRawData(id, rawData);
+                                                    opcAsyncTask.addEventRawData(rawData);
                                                 } else {
                                                     eventFlage = false;
                                                 }
                                             }
                                         } else {
                                             if (eventFlage) {
-                                                opcAsyncTask.addEventRawData(id, rawData);
+                                                opcAsyncTask.addEventRawData(rawData);
                                             }
                                         }
                                     }
@@ -141,7 +141,7 @@ public class OpcDaLowseTask extends TimerTask {
                             }
                         } catch (Exception e) {
                             //执行组装数据库的数据,以及生成驱动报表
-                            opcAsyncTask.packageRawDataList(itemList,dataSourceId, sqlCurrentYmdh);
+                            opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
                             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -168,7 +168,7 @@ public class OpcDaLowseTask extends TimerTask {
                 if (!flage) {
                     //执行组装数据库的数据,以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
-                    opcAsyncTask.packageRawDataList(itemList,dataSourceId, sqlCurrentYmdh);
+                    opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
                     redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                     messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

+ 24 - 9
chaunyi_opc/opc_da/src/main/resources/mapper/RawDataDao.xml

@@ -28,16 +28,21 @@
     </insert>
 
     <insert id="addTempRawData">
-        insert into
-        t_raw_data
+        insert into t_raw_data
         (item_group_id, data_source_id, item_name, data_type, data_value, data_value_time, value_belong_time,
-        create_time)
-        VALUES
-        <foreach collection="rawDataList" item="rawData" index="index" separator=",">
-            (#{rawData.itemGroupId}, #{rawData.dataSourceId}, #{rawData.itemName}, #{rawData.dataType},
-            #{rawData.dataValue},
-            #{rawData.dataValueTime}, #{rawData.valueBelongTime}, #{rawData.createTime})
-        </foreach>
+         create_time)
+        VALUES (#{rawData.itemGroupId}, #{rawData.dataSourceId}, #{rawData.itemName}, #{rawData.dataType},
+                #{rawData.dataValue},
+                #{rawData.dataValueTime}, #{rawData.valueBelongTime}, #{rawData.createTime})
+    </insert>
+
+    <insert id="addEventRawData">
+        insert into t_event_raw_data
+        (item_group_id, data_source_id, item_name, data_type, data_value, data_value_time, value_belong_time,
+         create_time)
+        VALUES (#{rawData.itemGroupId}, #{rawData.dataSourceId}, #{rawData.itemName}, #{rawData.dataType},
+                #{rawData.dataValue},
+                #{rawData.dataValueTime}, #{rawData.valueBelongTime}, #{rawData.createTime})
     </insert>
 
     <delete id="delRawDataList">
@@ -124,4 +129,14 @@
         and item_name = #{item.itemReadName}
         and value_belong_time = #{valueBelongTime}
     </select>
+
+    <select id="getEventRawDataList" resultType="com.example.opc_common.entity.RawData">
+        select
+        <include refid="rawData"/>
+        from t_evnet_raw_data
+        where item_group_id = #{item.itemGroupId}
+        and data_souerce_id = #{dataSourceId}
+        and item_name = #{item.itemReadName}
+        and value_belong_time = #{valueBelongTime}
+    </select>
 </mapper>

+ 9 - 9
chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcUaExceedTask.java

@@ -134,15 +134,15 @@ public class OpcUaExceedTask extends TimerTask {
                             }
                         }
                     } catch (Exception e) {
-                        RawData rawData = new RawData(id, dataSourceId, itemId, javaType, JSON.toJSONString(value.toString()),
-                                currentYmdhmss, currentYmdh, new Date());
-                        opcAsyncTask.addTempRawData(rawData);
-
-                        if (Blank.isEmpty(eventMode, eventValue, tableReportId)) {
-                            if (eventFlage) {
-                                opcAsyncTask.addEventRawData(rawData);
-                            }
-                        }
+//                        RawData rawData = new RawData(id, dataSourceId, itemId, javaType, JSON.toJSONString(value.toString()),
+//                                currentYmdhmss, currentYmdh, new Date());
+//                        opcAsyncTask.addTempRawData(rawData);
+//
+//                        if (Blank.isEmpty(eventMode, eventValue, tableReportId)) {
+//                            if (eventFlage) {
+//                                opcAsyncTask.addEventRawData(rawData);
+//                            }
+//                        }
                     }
                 }
             } catch (Exception e) {

+ 9 - 9
chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcUaLowerTask.java

@@ -133,15 +133,15 @@ public class OpcUaLowerTask extends TimerTask {
                             }
                         }
                     } catch (Exception e) {
-                        RawData rawData = new RawData(id, dataSourceId, itemId, javaType, JSON.toJSONString(value.toString()),
-                                currentYmdhmss, currentYmdh, new Date());
-                        opcAsyncTask.addTempRawData(rawData);
-
-                        if (Blank.isEmpty(eventMode, eventValue, tableReportId)) {
-                            if (eventFlage) {
-                                opcAsyncTask.addEventRawData(rawData);
-                            }
-                        }
+//                        RawData rawData = new RawData(id, dataSourceId, itemId, javaType, JSON.toJSONString(value.toString()),
+//                                currentYmdhmss, currentYmdh, new Date());
+//                        opcAsyncTask.addTempRawData(rawData);
+//
+//                        if (Blank.isEmpty(eventMode, eventValue, tableReportId)) {
+//                            if (eventFlage) {
+//                                opcAsyncTask.addEventRawData(rawData);
+//                            }
+//                        }
                     }
                 }
             } catch (Exception e) {