ver1.7.5

Author: bambooww

core/pom.xml

@@ -293,6 +293,10 @@
     <version>2.11.0</version>
 </dependency>
 
+<dependency>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-api</artifactId>
+</dependency>
 
 	</dependencies>
 

core/src/main/java/org/iottree/core/UATag.java

@@ -1659,7 +1659,11 @@ else if(ch.isConnMsg())
 			else if(ch.isConnBind())
 			{
 				ConnPtBinder cpt = (ConnPtBinder)ch.getConnPt();
-				cpt.RT_writeValByBind(this.getNodeCxtPathIn(ch), v.toString());
+				
+				//ValTP tp = this.getValTp();
+				String sssv = UAVal.transObj2StrVal(v,-1) ;
+				//Object strv = UAVal..transStr2ObjVal(tp, strv);
+				cpt.RT_writeValByBind(this.getNodeCxtPathIn(ch), sssv);//v.toString());
 				return true;
 			}
 			else

core/src/main/java/org/iottree/core/UAVal.java

@@ -244,6 +244,27 @@ public static Object transStr2ObjVal(ValTP tp,String strv)
 		}
 	}
 
+	public static String transObj2StrVal(Object objv,int dec_digits)
+	{
+		if(objv==null)
+			return "" ;
+		
+		if(dec_digits>0)
+		{
+			if(objv instanceof Float || objv instanceof Double)
+			{
+				return Convert.toDecimalDigitsStr(((Number)objv).doubleValue(), dec_digits,false) ;
+			}
+		}
+//		//System.out.println(objVal.getClass()) ;
+		if(objv instanceof java.util.Date)
+		{
+			return Convert.toFullYMDHMS((java.util.Date)objv) ;
+			//return Convert.toShortYMD(d)
+		}
+		return objv.toString() ;
+	}
+	
 
 	Object objVal = null ;
 
@@ -409,6 +430,12 @@ public String getStrVal(int dec_digits)
 				return Convert.toDecimalDigitsStr(((Number)objVal).doubleValue(), dec_digits,false) ;
 			}
 		}
+//		//System.out.println(objVal.getClass()) ;
+		if(objVal instanceof java.util.Date)
+		{
+			return Convert.toFullYMDHMS((java.util.Date)objVal) ;
+			//return Convert.toShortYMD(d)
+		}
 		return objVal.toString() ;
 	}
 

core/src/main/java/org/iottree/core/conn/ConnPtOPCUA.java

@@ -5,7 +5,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.cert.X509Certificate;
@@ -28,25 +27,25 @@
 import org.eclipse.milo.opcua.sdk.client.nodes.UaNode;
 import org.eclipse.milo.opcua.sdk.client.nodes.UaVariableNode;
 import org.eclipse.milo.opcua.sdk.client.nodes.UaVariableTypeNode;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
 import org.eclipse.milo.opcua.stack.core.NodeIds;
 import org.eclipse.milo.opcua.stack.core.OpcUaDataType;
 import org.eclipse.milo.opcua.stack.core.UaException;
-import org.eclipse.milo.opcua.stack.core.security.FileBasedTrustListManager;
 import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.eclipse.milo.opcua.stack.core.security.TrustListManager;
+import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
 import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
+import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime;
 import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
 import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
+import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UByte;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
+import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.ULong;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UShort;
 import org.eclipse.milo.opcua.stack.core.types.enumerated.MessageSecurityMode;
 import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
 import org.eclipse.milo.opcua.stack.core.types.structured.ApplicationDescription;
 import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
-import org.eclipse.milo.opcua.stack.core.types.structured.WriteValue;
 import org.iottree.core.Config;
 import org.iottree.core.UACh;
 import org.iottree.core.UANode;
@@ -804,7 +803,7 @@ public void writeBindBeSelectTreeSub(Writer w, String pnode_id) throws Exception
 	{
 		NodeId pnid = null;
 		if (Convert.isNullOrEmpty(pnode_id))
-			pnid = Identifiers.RootFolder;
+			pnid = NodeIds.RootFolder;
 		else
 			pnid = NodeId.parse(pnode_id);
 		if (pnid == null)
@@ -963,7 +962,7 @@ public void writeUaNodeTreeJson(Writer w, boolean b_var, boolean force_refresh)
 
 	public static UaNode findUaNodeByPath(OpcUaClient client, String[] path) throws UaException
 	{
-		NodeId nid = Identifiers.RootFolder;
+		NodeId nid = NodeIds.RootFolder;
 
 		UaNode pn = client.getAddressSpace().getNode(nid);
 		if (pn == null)
@@ -995,7 +994,7 @@ public static void writeUaNodeTreeJson(Writer w, OpcUaClient client, String node
 	{
 		NodeId nid = null;
 		if (Convert.isNullOrEmpty(nodeid))
-			nid = Identifiers.RootFolder;
+			nid = NodeIds.RootFolder;
 		else
 			nid = NodeId.parse(nodeid);
 		if (nid == null)
@@ -1019,7 +1018,7 @@ public static void writeUaNodeTreeJson(Writer w, OpcUaClient client, UaNode n, b
 
 		boolean bvar = n instanceof UaVariableNode;
 
-		System.out.println(nid.toParseableString()) ;
+		//System.out.println(nid.toParseableString()) ;
 		w.write("{\"id\":\"" + nid.toParseableString() + "\"");
 		w.write(",\"nc\":" + n.getNodeClass().getValue());
 		if (bvar)
@@ -1381,8 +1380,7 @@ private void readDataInLoop()
 				UShort us = nodeid.getNamespaceIndex();
 				Object id = nodeid.getIdentifier();
 				//DataValue v = uaClient.readValue(maxAge, timestampsToReturn, nodeId)
-				DataValue v = uaClient.readValue(0.0, TimestampsToReturn.Both, nodeid);//.get();
-
+				DataValue v = uaClient.readValue(0.0, TimestampsToReturn.Both, nodeid);//.get()
 				updateTagVal(ch, tag2n.getKey(), v);
 			}
 		}
@@ -1395,6 +1393,8 @@ private void readDataInLoop()
 			lastReadData = System.currentTimeMillis();
 		}
 	}
+	
+	private transient HashMap<String,DataValue> lastTagP2GoodDV = new HashMap<>() ;
 
 	private void updateTagVal(UACh ch, String tagpath, DataValue v) throws Exception
 	{
@@ -1415,22 +1415,22 @@ private void updateTagVal(UACh ch, String tagpath, DataValue v) throws Exception
 		// itemval.getValue().
 		if (sc.isGood())
 		{
+			lastTagP2GoodDV.put(tagpath,v) ;
 			long chgdt = v.getServerTime().getJavaTime();
 			// itemval.
 			// UAVal uav =
 			// UAVal.createByStrVal(tag.getValTp(),itemval.getLastValueStr(),chgdt,chgdt);
 			// tag.RT_setUAVal(uav);
-//			if(objv instanceof DateTime)
-//			{
-//				
-//			}
+			if(objv instanceof DateTime)
+			{
+				
+			}
 			String strv = objv.toString() ;
 			OpcUaDataType dtp = vvt.getDataType().get() ;
 			if("DateTime".equals(dtp.name()))
 			{
-				return;
-				//DateTime dt = (DateTime) vvt.getValue();
-				//dt.getJavaDate() ;
+				DateTime dt = (DateTime) vvt.getValue();
+				strv = Convert.toFullYMDHMS(dt.getJavaDate()) ;
 			}
 
 			tag.RT_setValRawStr(strv, true, chgdt);
@@ -1495,6 +1495,46 @@ synchronized void disconnect() // throws IOException
 			uaClient = null;
 		}
 	}
+	
+	private static Object transStr2Obj(OpcUaDataType dt,String strv)
+	{
+		switch(dt)
+		{
+		case Boolean://(1, Boolean.class),
+			return "true".equalsIgnoreCase(strv) || "1".equals(strv) ;
+		case SByte://(2, Byte.class),
+			return Byte.parseByte(strv) ;
+		case Byte://(3, UByte.class),
+			return UByte.valueOf(strv) ;
+		case Int16://(4, Short.class),
+			return Short.parseShort(strv) ;
+		case UInt16://(5, UShort.class),
+			return UShort.valueOf(strv) ;
+		case Int32://(6, Integer.class),
+			return Integer.parseInt(strv) ;
+		case UInt32://(7, UInteger.class),
+			return UInteger.valueOf(strv) ;
+		case Int64://(8, Long.class),
+			return Long.parseLong(strv) ;
+		case UInt64://(9, ULong.class),
+			return ULong.valueOf(strv) ;
+		case Float://(10, Float.class),
+			return Float.parseFloat(strv) ;
+		case Double://(11, Double.class),
+			return Double.parseDouble(strv) ;
+		case String://(12, String.class),
+			return strv ;
+		case DateTime://(13, ),
+			return new DateTime(Convert.toCalendar(strv).toInstant()) ;
+		case Guid://(14, UUID.class),
+			return UUID.fromString(strv) ;
+		case ByteString://(15, ByteString.class),
+			byte[] bs = Convert.hexStr2ByteArray(strv) ;
+			return ByteString.of(bs) ;
+		default:
+			return null ;
+		}
+	}
 
 	public void RT_writeValByBind(String tagpath, String strv)
 	{
@@ -1506,16 +1546,35 @@ public void RT_writeValByBind(String tagpath, String strv)
 		NodeId nid = tag2nodeid.get(tagpath);
 		if (nid == null)
 			return;
-
-		Variant v = new Variant(Integer.parseInt(strv));
-		DataValue dataValue = new DataValue(v, null, null);
-		WriteValue wv = new WriteValue(nid,null,"",dataValue);
+		DataValue lastdv = lastTagP2GoodDV.get(tagpath) ;
+		if(lastdv==null)
+			return ;
+		
+		OpcUaDataType dt = lastdv.getValue().getDataType().get() ;
+		if(dt==null)
+			return ;
+		Object objv = transStr2Obj(dt,strv) ;
+		if(objv==null)
+			return ;
+		
+		Variant v = new Variant(objv);
+		DataValue dataValue = new DataValue(v,StatusCode.GOOD,null); //timestamp may not allowed
+		//WriteValue wv = new WriteValue(nid,null,"",dataValue);
 		try
 		{
 			//StatusCode statusCode = uaClient.write(Arrays.asList(wv)).getResults()[0] ;
-			StatusCode statusCode = uaClient.writeValues(Arrays.asList(nid), Arrays.asList(dataValue)).get(0);
-			boolean r = statusCode.isGood();
-			System.out.println("w result=" + r);
+			List<StatusCode> scs = uaClient.writeValues(Arrays.asList(nid), Arrays.asList(dataValue)) ;
+			if(scs!=null && scs.size()>0)
+			{
+				StatusCode statusCode = scs.get(0);
+				boolean r = statusCode.isGood();
+				if(log.isDebugEnabled())
+				{
+					log.debug("w result=" + r+" status value="+statusCode.getValue()+" wstr="+strv+" objv="+objv+" objvt="+objv.getClass().getCanonicalName());
+					if(!r)
+						log.debug(" status code="+statusCode.toString());
+				}
+			}
 		}
 		catch ( Exception e)
 		{

core/src/main/java/org/iottree/core/conn/opcua/KeyStoreLoader.java

@@ -56,7 +56,6 @@ public KeyStoreLoader load(Path baseDir) throws Exception
 					.setApplicationUri(ConnPtOPCUA.CLIENT_APP_URI)
 					.addDnsName(hostn).setValidityPeriod(Period.ofYears(10));
 			// .addIpAddress("127.0.0.1")
-			
 
 			// Get as many hostnames and IP addresses as we can listed in the
 			// certificate.

driver-parent/pom.xml

@@ -24,7 +24,7 @@
   </properties>
 
   <modules>
-    <module>driver-opc</module>
+    <!-- <module>driver-opc</module> -->
     <module>driver-common</module>
   </modules>
 

pom.xml

@@ -31,7 +31,7 @@
 		<spring.version>5.2.9.RELEASE</spring.version>
 		<!-- 3.8.1 -->
         <junit.version>4.12</junit.version>
-        <slf4j.version>1.7.12</slf4j.version>
+        <slf4j.version>2.0.9</slf4j.version>
         <logback.version>1.1.11</logback.version>
 
 
@@ -139,6 +139,13 @@
 			<artifactId>wrapper</artifactId>
 			<version>3.2.3</version>
 		</dependency>
+		
+		<dependency>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-api</artifactId>
+    <version>${slf4j.version}</version>
+</dependency>
+
 		<!-- https://mvnrepository.com/artifact/javax.servlet/servlet-api -->
 
 		<!-- https://mvnrepository.com/artifact/org.apache.tomcat/jasper -->

server/pom.xml

@@ -317,7 +317,7 @@
 			                    <delete file="../_output/lib/iottree-ext-pro-${project.version}.jar" />
 
 			                    <echo message="package zip file" />
-			                    <!-- 
+			                    
 			                    <zip destfile="../_output/iot-tree-${project.version}-winjre8x86.zip" >
 					                  <fileset dir="../_output/">
 					                    <exclude name="jre/"/>
@@ -348,18 +348,7 @@
 					                    <exclude name="iot-tree-${project.version}-winjre8x86.zip"/>
 					                  </fileset>
                 				</zip>
-			                         -->
-                				 <delete file="../_output/lib/iottree-ext-opcda.jar" />
-
-			                    <zip destfile="../_output/iot-tree-${project.version}.zip" >
-					                  <fileset dir="../_output/">
-					                    <exclude name="jre8_x86/"/>
-					                    <exclude name="jre/"/>
-					                    <exclude name="iot-tree-${project.version}.zip"/>
-					                    <exclude name="iot-tree-${project.version}-winjre.zip"/>
-					                    <exclude name="iot-tree-${project.version}-winjre8x86.zip"/>
-					                  </fileset>
-                				</zip>
+			                         
 							</tasks>
 						</configuration>
 					</execution>

web/admin/ua_cxt/cxt_tags.jsp

@@ -217,15 +217,15 @@ if(b_tags)
     	<th sort_by="name"><wbt:g>tag</wbt:g></th>
     	<th sort_by="title"><wbt:g>title</wbt:g></th>
         <th sort_by="addr"><wbt:g>addr</wbt:g></th>
-        <th sort_by="valtp"><wbt:g>val,type</wbt:g></th>
+        <th sort_by="valtp" style="width:80px;"><wbt:g>val,type</wbt:g></th>
         <th ><wbt:g>indicator</wbt:g></th>
-        <th><wbt:g>val</wbt:g></th>
+        <th style="min-width:120px;"><wbt:g>val</wbt:g></th>
         <th><wbt:g>unit</wbt:g></th>
         <th ><wbt:g>alert</wbt:g></th>
         <th><wbt:g>update,time</wbt:g></th>
         <th><wbt:g>change,time</wbt:g></th>
         <th><wbt:g>valid</wbt:g></th>
-        <th><wbt:g>write</wbt:g></th>
+        <th style="width:110px;"><wbt:g>write</wbt:g></th>
         <th><wbt:g>oper</wbt:g></th>
 <%
 if(prj!=null)

web/admin/ua_cxt/cxt_tags_tb_ajax.jsp

@@ -228,7 +228,7 @@ if(bloc&&!tag.isSysTag())
         <td><%=addr%></td>
         <td><%=valtp_str %></td>
         <td><%=indicator_t %></td>
-        <td style="width:80px;text-align:right;" id="ctag_v_<%=cxtpath%>" filter="<%=anti%>"></td>
+        <td style="text-align:right;" id="ctag_v_<%=cxtpath%>" filter="<%=anti%>"></td>
         <td title="<%=unit_tt%>"><%=unit_t %></td>
         <td><span id="ctag_alert_<%=cxtpath%>"><%=alert_str %></span></td>
         <td id="ctag_dt_<%=cxtpath%>"></td>
@@ -239,7 +239,7 @@ if(bloc&&!tag.isSysTag())
 	if(tag.isCanWrite())
 	{
 %>
-        	<input type="text" id="ctag_w_<%=tag.getId()%>" value="" size="8" style="color:#999999"/><a href="javascript:w_tag('<%=tag.getId()%>')"><i class="fa fa-pencil-square" aria-hidden="true"></i></a>
+        	<input type="text" id="ctag_w_<%=tag.getId()%>" value="" style="color:#999999;width:90px"/><a href="javascript:w_tag('<%=tag.getId()%>')"><i class="fa fa-pencil-square" aria-hidden="true"></i></a>
 <%
 	}
 %>