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

chaunyi_opc/opc_common/src/main/java/com/example/opc_common/entity/ReportTableItem.java

@@ -21,6 +21,10 @@ public class ReportTableItem implements Serializable {
      */
     private Integer itemId;
     /**
+     * 数据项名，虚拟字段
+     */
+    private String itemName;
+    /**
      * 横坐标，x轴
      */
     private Integer xaxis;

chaunyi_opc/opc_common/src/main/java/com/example/opc_common/util/ArrayUtil.java

@@ -0,0 +1,52 @@
+package com.example.opc_common.util;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ArrayUtil {
+
+    /**
+     * 将不带中括号的字符串转为List,且泛型不能为String
+     *
+     * @param str
+     * @param clazz
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> strToList(String str, Class<T> clazz) {
+        List<T> list = JSON.parseObject(Arrays.asList(str.split(",")).toString(), List.class);
+        return list;
+    }
+
+    /**
+     * 将不带中括号的字符串转为List<String>
+     *
+     * @param str
+     * @return
+     */
+    public static List<String> strToListstr(String str) {
+        String[] split = str.split(",");
+        int length = split.length;
+        if (length == 0) {
+            //通过判断原来的字符串中含有几个"，"进行判断他的长度
+            //使用集合进行add，不会丢失长度
+        }
+        return new ArrayList<>(Arrays.asList(str.split(",")));
+    }
+
+    /**
+     * 将集合转换为不带中括号的字符串
+     *
+     * @param list
+     * @param <T>
+     * @return
+     */
+    public static <T> String listToStr(List<T> list) {
+        return StringUtils.join(list, ",");
+    }
+}

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

@@ -580,9 +580,18 @@
     </select>
 
     <select id="getTableItemListById" resultType="com.example.opc_common.entity.ReportTableItem">
-        select
-        <include refid="reportTableItem"/>
-        from t_report_table_item
+        select trti.id
+             , trti.report_table_id
+             , trti.item_id
+             , ti.item_name
+             , trti.xaxis
+             , trti.yaxis
+             , trti.standby
+             , trti.value_list
+             , trti.value_time_list
+             , trti.value_index_list
+        from t_report_table_item trti
+                 left join t_item ti on trti.item_id = ti.id
         where report_table_id = #{tableId}
     </select>
 

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

@@ -99,9 +99,9 @@ public class OpcUaChangeTask extends TimerTask {
             BigDecimal oldValue = JSON.parseObject(redisValue.toString(), BigDecimal.class);
             try {
                 DataValue dataValue = opcUaClient.readValue(0.0, TimestampsToReturn.Both, n).get();
-                if (!dataValue.getStatusCode().isGood()) {
-                    continue;
-                }
+//                if (!dataValue.getStatusCode().isGood()) {
+//                    continue;
+//                }
                 Object value = dataValue.getValue().getValue();
                 String javaType = OpcUaUtil.getValType(dataValue);
                 Date time = dataValue.getServerTime().getJavaDate();

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

@@ -102,9 +102,9 @@ public class OpcUaExceedTask extends TimerTask {
                         opcAsyncTask.packageEventTable(itemList, dataSourceId, index - 1);
                     }
                 }
-                if (!dataValue.getStatusCode().isGood()) {
-                    continue;
-                }
+//                if (!dataValue.getStatusCode().isGood()) {
+//                    continue;
+//                }
                 Object value = dataValue.getValue().getValue();
                 String javaType = OpcUaUtil.getValType(dataValue);
                 Date time = dataValue.getServerTime().getJavaDate();

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

@@ -96,9 +96,9 @@ public class OpcUaFrequencyTask extends TimerTask {
             DataModel dm = map.get(itemId);
             try {
                 DataValue dataValue = opcUaClient.readValue(0.0, TimestampsToReturn.Both, n).get();
-                if (!dataValue.getStatusCode().isGood()) {
-                    continue;
-                }
+//                if (!dataValue.getStatusCode().isGood()) {
+//                    continue;
+//                }
                 Object value = dataValue.getValue().getValue();
                 String javaType = OpcUaUtil.getValType(dataValue);
                 Date time = dataValue.getServerTime().getJavaDate();