Merge branch 'master' of http://116.63.33.55/git/read_opc

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/dao/RawDataDao.java

@@ -32,7 +32,9 @@ public interface RawDataDao {
 
     RawData getRawDataList(Item item, Integer remainder, Integer dataSourceId, String valueBelongTime);
 
-    List<RawData> getEventRawDataList(Item item, Integer remainder, Integer dataSourceId, String valueBelongTime);
+    List<RawData> getEventRawDataList(Item item, Integer dataSourceId, String valueBelongTime);
 
     Integer addEventRawData(RawData rawData);
+
+    Integer delEventRawDataList(Item item, Integer dataSourceId, String valueBelongTime);
 }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcAsyncTask.java

@@ -127,7 +127,7 @@ public class OpcAsyncTask {
 
     public void packageRawDataList(List<Item> itemList, Integer dataSourceId, String sqlCurrentYmdh) {
         try {
-            Thread.sleep(50000);
+            Thread.sleep(10000);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -182,8 +182,8 @@ public class OpcAsyncTask {
         }
     }
 
-    public void addEventRawData( RawData rawData) {
-        if ( Blank.isNotEmpty(rawData)) {
+    public void addEventRawData(RawData rawData) {
+        if (Blank.isNotEmpty(rawData)) {
             rawDataDao.addEventRawData(rawData);
         }
     }
@@ -251,7 +251,24 @@ public class OpcAsyncTask {
     /**
      * 事件驱动报表异步添加数据
      */
-    public void eventTable(Integer dataSourceId, Integer tableReportId, List<Item> itemList, String sqlCurrentYmdh) {
+    public void eventTable(Integer dataSourceId, List<Item> itemList, String sqlCurrentYmdh) {
+        try {
+            Thread.sleep(10000);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Integer tableReportId = null;
+        if (Blank.isNotEmpty(itemList)) {
+            for (Item item : itemList) {
+                if (Blank.isNotEmpty(item.getEventMode()) && Blank.isNotEmpty(item.getEventValue()) && Blank.isNotEmpty(item.getTableReportId())) {
+                    tableReportId = item.getTableReportId();
+                    break;
+                }
+            }
+        }
+        if (Blank.isEmpty(tableReportId)) {
+            return;
+        }
         ReportTable reportTable = reportTableDao.getReportTableById(tableReportId);
         String reportTableData = reportTable.getReportTableData();
         JSONObject jsonObject = JSONObject.parseObject(reportTableData);
@@ -278,11 +295,8 @@ public class OpcAsyncTask {
         JSONObject jsonObject1 = objects.getJSONObject(0);
         JSONArray objects1 = jsonObject1.getJSONArray("item");
         if (Blank.isNotEmpty(itemList)) {
-            Item item = itemList.get(0);
-            Integer itemGroupId = item.getItemGroupId();
-            Integer remainder = itemGroupId % ConstantStr.SUB_TABLE_NUM;
             for (int i = 0; i < itemList.size(); i++) {
-                List<RawData> rawDataList = rawDataDao.getEventRawDataList(itemList.get(i), remainder, dataSourceId, sqlCurrentYmdh);
+                List<RawData> rawDataList = rawDataDao.getEventRawDataList(itemList.get(i), dataSourceId, sqlCurrentYmdh);
                 if (Blank.isNotEmpty(rawDataList)) {
                     JSONObject jsonObject2 = new JSONObject();
                     RawData rawData = rawDataList.get(0);
@@ -311,6 +325,7 @@ public class OpcAsyncTask {
                     jsonObject2.put("dataTimeList", JSON.parseObject(rawData.getDataValueTime(), String[].class));
                     objects1.set(i, jsonObject2);
                 }
+                rawDataDao.delEventRawDataList(itemList.get(i), dataSourceId, sqlCurrentYmdh);
             }
         }
         objects.set(0, jsonObject1);

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaChangeTask.java

@@ -98,7 +98,11 @@ public class OpcDaChangeTask extends TimerTask {
                                 if (!sqlCurrentYmdh.equals(currentYmdh)) {
                                     //组装相应的数据
                                     opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                                    if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                        opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                                    }
                                     redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                                    sqlCurrentYmdh = currentYmdh;
                                 }
                             }
                             String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -172,6 +176,9 @@ public class OpcDaChangeTask extends TimerTask {
                         } catch (Exception e) {
                             //执行组装数据库的数据,以及生成驱动报表
                             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                            if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                            }
                             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -202,6 +209,7 @@ public class OpcDaChangeTask extends TimerTask {
                     //执行组装数据库的数据，以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
                     opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
                     redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                     messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaExceedTask.java

@@ -98,7 +98,11 @@ public class OpcDaExceedTask extends TimerTask {
                                 if (!sqlCurrentYmdh.equals(currentYmdh)) {
                                     //组装相应的数据
                                     opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                                    if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                        opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                                    }
                                     redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                                    sqlCurrentYmdh = currentYmdh;
                                 }
                             }
                             String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -142,6 +146,9 @@ public class OpcDaExceedTask extends TimerTask {
                         } catch (Exception e) {
                             //执行组装数据库的数据,以及生成驱动报表
                             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                            if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                            }
                             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -169,6 +176,7 @@ public class OpcDaExceedTask extends TimerTask {
                     //执行组装数据库的数据，以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
                     opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
                     redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                     messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaFrequencyTask.java

@@ -97,7 +97,11 @@ public class OpcDaFrequencyTask extends TimerTask {
                                 if (!sqlCurrentYmdh.equals(currentYmdh)) {
                                     //组装相应的数据
                                     opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                                    if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                        opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                                    }
                                     redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                                    sqlCurrentYmdh = currentYmdh;
                                 }
                             }
                             //服务器读取的时间
@@ -171,6 +175,9 @@ public class OpcDaFrequencyTask extends TimerTask {
                         } catch (Exception e) {
                             //执行组装数据库的数据,以及生成驱动报表
                             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                            if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                            }
                             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -197,6 +204,7 @@ public class OpcDaFrequencyTask extends TimerTask {
                     //执行组装数据库的数据，以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
                     opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
                     redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                     messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/task/OpcDaLowseTask.java

@@ -98,7 +98,11 @@ public class OpcDaLowseTask extends TimerTask {
                                 if (!sqlCurrentYmdh.equals(currentYmdh)) {
                                     //组装相应的数据
                                     opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                                    if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                        opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                                    }
                                     redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                                    sqlCurrentYmdh = currentYmdh;
                                 }
                             }
                             String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -142,6 +146,9 @@ public class OpcDaLowseTask extends TimerTask {
                         } catch (Exception e) {
                             //执行组装数据库的数据,以及生成驱动报表
                             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                            if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                                opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                            }
                             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -169,6 +176,7 @@ public class OpcDaLowseTask extends TimerTask {
                     //执行组装数据库的数据，以及生成驱动报表
                     String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
                     opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
                     redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                     messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_da/src/main/resources/mapper/RawDataDao.xml

@@ -55,6 +55,15 @@
         </foreach>
     </delete>
 
+    <delete id="delEventRawDataList">
+        delete
+        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}
+    </delete>
+
     <select id="getLineOrBarData" resultType="com.example.opc_common.entity.RawData">
         SELECT id, data_source_id, item_name, data_type, data_value, create_time
         FROM t_raw_data${remainder}

chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/dao/RawDataDao.java

@@ -23,5 +23,7 @@ public interface RawDataDao {
 
     Integer addEventRawData(RawData rawData);
 
-    List<RawData> getEventRawDataList(Item item, Integer remainder, Integer dataSourceId, String valueBelongTime);
+    List<RawData> getEventRawDataList(Item item, Integer dataSourceId, String valueBelongTime);
+
+    Integer delEventRawDataList(Item item, Integer dataSourceId, String valueBelongTime);
 }

chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcAsyncTask.java

@@ -119,7 +119,7 @@ public class OpcAsyncTask {
 
     public void packageRawDataList(List<Item> itemList, Integer dataSourceId, String sqlCurrentYmdh) {
         try {
-            Thread.sleep(50000);
+            Thread.sleep(10000);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -195,7 +195,24 @@ public class OpcAsyncTask {
     /**
      * 事件驱动报表异步添加数据
      */
-    public void eventTable(Integer dataSourceId, Integer tableReportId, List<Item> itemList, String sqlCurrentYmdh) {
+    public void eventTable(Integer dataSourceId, List<Item> itemList, String sqlCurrentYmdh) {
+        try {
+            Thread.sleep(10000);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Integer tableReportId = null;
+        if (Blank.isNotEmpty(itemList)) {
+            for (Item item : itemList) {
+                if (Blank.isNotEmpty(item.getEventMode()) && Blank.isNotEmpty(item.getEventValue()) && Blank.isNotEmpty(item.getTableReportId())) {
+                    tableReportId = item.getTableReportId();
+                    break;
+                }
+            }
+        }
+        if (Blank.isEmpty(tableReportId)) {
+            return;
+        }
         ReportTable reportTable = reportTableDao.getReportTableById(tableReportId);
         String reportTableData = reportTable.getReportTableData();
         JSONObject jsonObject = JSONObject.parseObject(reportTableData);
@@ -222,11 +239,8 @@ public class OpcAsyncTask {
         JSONObject jsonObject1 = objects.getJSONObject(0);
         JSONArray objects1 = jsonObject1.getJSONArray("item");
         if (Blank.isNotEmpty(itemList)) {
-            Item item = itemList.get(0);
-            Integer itemGroupId = item.getItemGroupId();
-            Integer remainder = itemGroupId % ConstantStr.SUB_TABLE_NUM;
             for (int i = 0; i < itemList.size(); i++) {
-                List<RawData> rawDataList = rawDataDao.getEventRawDataList(itemList.get(i), remainder, dataSourceId, sqlCurrentYmdh);
+                List<RawData> rawDataList = rawDataDao.getEventRawDataList(itemList.get(i), dataSourceId, sqlCurrentYmdh);
                 if (Blank.isNotEmpty(rawDataList)) {
                     JSONObject jsonObject2 = new JSONObject();
                     RawData rawData = rawDataList.get(0);
@@ -255,6 +269,7 @@ public class OpcAsyncTask {
                     jsonObject2.put("dataTimeList", JSON.parseObject(rawData.getDataValueTime(), String[].class));
                     objects1.set(i, jsonObject2);
                 }
+                rawDataDao.delEventRawDataList(itemList.get(i), dataSourceId, sqlCurrentYmdh);
             }
         }
         objects.set(0, jsonObject1);

chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcUaChangeTask.java

@@ -96,7 +96,11 @@ public class OpcUaChangeTask extends TimerTask {
                     if (!sqlCurrentYmdh.equals(currentYmdh)) {
                         //组装相应的数据
                         opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                        if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                        }
                         redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                        sqlCurrentYmdh = currentYmdh;
                     }
                 }
                 String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -172,6 +176,9 @@ public class OpcUaChangeTask extends TimerTask {
             } catch (Exception e) {
                 //执行组装数据库的数据,以及生成驱动报表
                 opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                }
                 redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                 messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -195,6 +202,7 @@ public class OpcUaChangeTask extends TimerTask {
             //执行组装数据库的数据，以及生成驱动报表
             String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
             if (Blank.isNotEmpty(opcUaClient)) {

chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcUaExceedTask.java

@@ -95,7 +95,11 @@ public class OpcUaExceedTask extends TimerTask {
                     if (!sqlCurrentYmdh.equals(currentYmdh)) {
                         //组装相应的数据
                         opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                        if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                        }
                         redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                        sqlCurrentYmdh = currentYmdh;
                     }
                 }
                 String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -148,6 +152,9 @@ public class OpcUaExceedTask extends TimerTask {
             } catch (Exception e) {
                 //执行组装数据库的数据,以及生成驱动报表
                 opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                }
                 redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                 messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -172,6 +179,7 @@ public class OpcUaExceedTask extends TimerTask {
             //执行组装数据库的数据，以及生成驱动报表
             String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcUaFrequencyTask.java

@@ -96,7 +96,11 @@ public class OpcUaFrequencyTask extends TimerTask {
                     if (!sqlCurrentYmdh.equals(currentYmdh)) {
                         //组装相应的数据
                         opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                        if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                        }
                         redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                        sqlCurrentYmdh = currentYmdh;
                     }
                 }
                 String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -168,6 +172,9 @@ public class OpcUaFrequencyTask extends TimerTask {
             } catch (Exception e) {
                 //执行组装数据库的数据,以及生成驱动报表
                 opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                }
                 redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                 messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -192,6 +199,7 @@ public class OpcUaFrequencyTask extends TimerTask {
             //执行组装数据库的数据，以及生成驱动报表
             String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_ua/src/main/java/com/example/opc_ua/task/OpcUaLowerTask.java

@@ -94,7 +94,11 @@ public class OpcUaLowerTask extends TimerTask {
                     if (!sqlCurrentYmdh.equals(currentYmdh)) {
                         //组装相应的数据
                         opcAsyncTask.packageRawData(item, dataSourceId, sqlCurrentYmdh);
+                        if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                        }
                         redisUtil.set(ConstantStr.VALUE_BELONG_TIME + id, currentYmdh, ConstantStr.TWO_HOUR);
+                        sqlCurrentYmdh = currentYmdh;
                     }
                 }
                 String currentYmdhmss = DateUtil.dateChangeStrYmdhmss(time);
@@ -147,6 +151,9 @@ public class OpcUaLowerTask extends TimerTask {
             } catch (Exception e) {
                 //执行组装数据库的数据,以及生成驱动报表
                 opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+                if (Blank.isNotEmpty(eventMode) && Blank.isNotEmpty(eventValue) && Blank.isNotEmpty(tableReportId)) {
+                    opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
+                }
                 redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
                 messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),
@@ -171,6 +178,7 @@ public class OpcUaLowerTask extends TimerTask {
             //执行组装数据库的数据，以及生成驱动报表
             String sqlCurrentYmdh = String.valueOf(redisUtil.get(ConstantStr.VALUE_BELONG_TIME + id));
             opcAsyncTask.packageRawDataList(itemList, dataSourceId, sqlCurrentYmdh);
+            opcAsyncTask.eventTable(dataSourceId, itemList, sqlCurrentYmdh);
             redisUtil.del(ConstantStr.VALUE_BELONG_TIME + id);
 
             messageNoticeDao.addMessageNotice(new MessageNotice(itemGroup.getUserId(),

chaunyi_opc/opc_ua/src/main/resources/mapper/RawDataDao.xml

@@ -55,6 +55,15 @@
         </foreach>
     </delete>
 
+    <delete id="delEventRawDataList">
+        delete
+        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}
+    </delete>
+
     <select id="getRawDataList" resultType="com.example.opc_common.entity.RawData">
         select
         <include refid="rawData"/>

chuanyi-admin/src/layout/components/Navbar.vue

@@ -218,9 +218,7 @@ export default {
             this.$router.push('/login')
           }
         })
-        .catch(() => {
-
-        })
+        .catch(() => {})
     },
     /** 修改密码 */
     submit() {
@@ -233,8 +231,10 @@ export default {
                 type: 'success',
                 message: '修改成功'
               })
-              await this.logout()
-              this.dialogVisible = false
+              const res = await this.$store.dispatch('user/Logout')
+              if (res.code === 200) {
+                this.$router.push('/login')
+              }
             }
           })
         } else {

chuanyi-admin/src/views/system/user/index.vue

@@ -652,6 +652,8 @@ export default {
         })
         return
       }
+      this.getRoleList()
+      this.getDeptList()
       userDetail({ userId: row.userId }).then((res) => {
         if (res.code === 200) {
           const data = res.data

reado-app/pages.json

@@ -16,7 +16,8 @@
 				"backgroundColor": "#2c3e50",
 				"app-plus": {
 					"softinputMode": "adjustResize"
-				}
+				},
+				"enablePullDownRefresh":true
 			}
 		},
 		{
@@ -25,7 +26,8 @@
 				"navigationBarTitleText": "消息",
 				"app-plus": {
 					"softinputMode": "adjustResize"
-				}
+				},
+				"enablePullDownRefresh":true
 			}
 		},
 		{

reado-app/pages/message/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<Nav title="消息" :isBack="false" />
 		<view class="section">
-			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower">
+			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower" height="100%">
 				<view v-for="item in msgList" :key="item.id" @click="handelDetail(item)">
 					<u-list-item>
 						<u-cell-group class="cell">
@@ -41,6 +41,9 @@
 		onShow() {
 			this.getMsgList()
 		},
+		onPullDownRefresh() {
+			this.getMsgList()
+		},
 		methods: {
 			// 获取消息数据
 			getMsgList() {
@@ -48,6 +51,7 @@
 					const data = res.data
 					if (data.code === 200) {
 						this.msgList = data.data.messageNoticeList
+						uni.stopPullDownRefresh()
 					}
 				})
 			},

reado-app/pages/message/msg-detail/index.vue

@@ -6,8 +6,8 @@
 				<view class="title">
 					<h2>{{msg.noticeTitle}}</h2>
 				</view>
-				<view class="time">
-					<text>发布日期：{{msg.createTime}}</text>
+				<view>
+					<view class="time">发布日期：{{msg.createTime}}</view>
 				</view>
 				<view class="cont">
 					<text>{{msg.noticeContent}}</text>
@@ -83,7 +83,7 @@
 			}
 
 			.time {
-				font-size: 16rpx;
+				font-size: 31rpx;
 				color: #9fa297;
 			}
 

reado-app/pages/reportForm/index.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-		<Nav title="报表" :isBack="false"/>
+		<Nav title="报表" :isBack="false" />
 		<view class="section">
-			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower">
+			<u-list finished-text="没有更多了" @scrolltolower="scrolltolower" height="100%">
 				<view v-for="item in reportList" :key="item.id" @click="handelDetail(item.id)">
 					<u-list-item>
 						<u-cell-group>
@@ -12,7 +12,7 @@
 				</view>
 			</u-list>
 			<view class="empty" v-if="!this.reportList.length">
-				<u-empty class="empty-icon" mode="data" icon="../../static/data.png">
+				<u-empty text="暂无数据" class="empty-icon" mode="data" icon="../../static/data.png">
 				</u-empty>
 			</view>
 		</view>
@@ -35,6 +35,9 @@
 		onShow() {
 			this.getAllReport()
 		},
+		onPullDownRefresh() {
+			this.getAllReport()
+		},
 		methods: {
 			// 获取报表数据
 			getAllReport() {
@@ -42,13 +45,14 @@
 					const data = res.data
 					if (data.code === 200) {
 						this.reportList = data.data.reportTableList
+						uni.stopPullDownRefresh()
 					}
 				})
 			},
 			// 前往详情页
 			handelDetail(id) {
 				uni.navigateTo({
-					url: "/pages/reportForm/report-detail/index?id="+id
+					url: "/pages/reportForm/report-detail/index?id=" + id
 				})
 			},
 			// 列表滚动到底部触发
@@ -75,14 +79,15 @@
 		right: 0;
 		left: 0;
 		bottom: 0;
-		.empty-icon{
-			width:400rpx;
+
+		.empty-icon {
+			width: 400rpx;
 			height: 400rpx;
 			position: absolute;
 			top: 30%;
 			left: 50%;
-			margin-left:-200rpx;
-			margin-top:-200rpx;
+			margin-left: -200rpx;
+			margin-top: -200rpx;
 		}
 	}
 </style>