1

chuanyi_server/src/main/java/com/judong/chuanyiserver/opc/OpcAsyncTask.java

@@ -142,9 +142,12 @@ public class OpcAsyncTask {
                     if (Blank.isNotEmpty(nodeIdList)) {
                         for (int i = 0; i < nodeIdList.size(); i++) {
                             DataValue dataValue = valueList.get(i);
+//                            dataValue.getServerTime().getJavaDate();
                             Variant value = dataValue.getValue();
+                            DataModel dm = map.get(nodeIdList.get(i));
                             ExpandedNodeId expandedNodeId = value.getDataType().get();
-                            rawDataList.add(new RawData(itemGroup.getDataSourceId(), nodeIdList.get(i).getIdentifier().toString(), expandedNodeId.getType().toString(), value.getValue().toString(), date));
+                            rawDataList.add(new RawData(itemGroup.getDataSourceId(), nodeIdList.get(i).getIdentifier().toString(), expandedNodeId.getType().toString(),
+                                    Blank.isNotEmpty(dm) ? MathUtil.quadricOperation(dm.getMathParameter(), dm.getOperationRule(), Double.valueOf(value.getValue().toString())).toString() : value.getValue().toString(), date));
                         }
                     }
 //                    for (DataValue dataValue : valueList) {