1.8.0

Author: bambooww

core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.iottree</groupId>
 		<artifactId>iottree-parent</artifactId>
-		<version>1.7.9</version>
+		<version>1.8.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -16,6 +16,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.iottree.core.util.CompressUUID;
 import org.iottree.core.util.Convert;
 import org.iottree.core.util.xmldata.XmlHelper;
 import org.w3c.dom.Document;
@@ -69,6 +70,8 @@ public boolean isDefault()
 	static String dataDynDirBase = null;
 
 	static String libDirBase = null;
+	
+	static String insUid = null ;
 
 	static
 	{
@@ -375,6 +378,42 @@ public static String getDataDirBase()
 
 		return dataFileBase + "/data/";
 	}
+	
+	public static String getInsUID()
+	{
+		if(Convert.isNotNullEmpty(insUid))
+			return insUid ;
+		
+		synchronized(Config.class)
+		{
+			if(Convert.isNotNullEmpty(insUid))
+				return insUid ;
+			
+			File ins_uidf = new File(getDataDirBase()+"_ins_uid.txt") ;
+			if(!ins_uidf.exists())
+			{
+				try
+				{
+					String insuid = CompressUUID.createNewId();
+					Convert.writeFileTxt(ins_uidf, insuid);
+					return insUid = insuid ;
+				}
+				catch(Exception ee)
+				{
+					throw new RuntimeException(ee) ;
+				}
+			}
+			
+			try
+			{
+				return insUid = Convert.readFileTxt(ins_uidf) ;
+			}
+			catch(Exception ee)
+			{
+				throw new RuntimeException(ee) ;
+			}
+		}
+	}
 
 	public static String getDataDynDirBase()
 	{

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

@@ -52,7 +52,7 @@ private static boolean registerProvider(JSONObject jo)
 		{
 			//e.printStackTrace();
 			if(log.isWarnEnabled())
-				log.warn(e.getMessage());//, "");
+				log.warn("load conn provider err:"+e.getMessage());//, "");
 			return false;
 		}
 	}

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

@@ -1461,7 +1461,7 @@ private void startStopConn(boolean b) // throws Exception
 					else
 						cp.stop();
 				}
-				catch ( Exception e)
+				catch (Throwable e)
 				{
 					e.printStackTrace();
 				}
@@ -1646,11 +1646,9 @@ public void run()
 
 	private void stopPrj()
 	{
-		
-		
 		startStopTask(false);
+		startStopCh(false);//must before ch,or it will cost more time
 		startStopConn(false);
-		startStopCh(false);
 
 		PrjSharer ps = getSharer();
 		if (ps != null)

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

@@ -37,7 +37,6 @@ public static enum ValTP
 		vt_str(9,-1,String.class),
 		vt_date(10,8,java.util.Date.class);
 
-		
 		private final int val ;
 		private final int byteLen;
 		private final Class<?> valC;

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

@@ -12,13 +12,17 @@
 import org.iottree.core.ConnProvider;
 import org.iottree.core.util.CompressUUID;
 import org.iottree.core.util.Convert;
+import org.iottree.core.util.logger.ILogger;
+import org.iottree.core.util.logger.LoggerManager;
 import org.iottree.core.util.xmldata.IXmlDataValidator;
 import org.iottree.core.util.xmldata.IXmlDataable;
 import org.iottree.core.util.xmldata.XmlData;
 
 
 public class ConnProTcpClient extends ConnProvider
 {
+	static ILogger log = LoggerManager.getLogger(ConnProTcpClient.class) ;
+	
 	public ConnProTcpClient()
 	{
 
@@ -107,10 +111,13 @@ private void disconnAll() //throws IOException
 			try
 			{
 				ConnPtTcpClient conn = (ConnPtTcpClient)ci ;
-//				long st = System.currentTimeMillis() ;
+				long st = System.currentTimeMillis() ;
 				conn.disconnect();
-//				long et = System.currentTimeMillis() ;
-//				System.out.println(" conn="+conn.getName()+" cost="+(et-st));
+				if(log.isDebugEnabled())
+				{
+					long et = System.currentTimeMillis() ;
+					log.debug(" disconnAll.conn="+conn.getName()+" cost="+(et-st));
+				}
 			}
 			catch(Exception e)
 			{

core/src/main/java/org/iottree/core/msgnet/nodes.json

@@ -78,7 +78,8 @@
 	{"cat":"_net","nodes":[
 		"org.iottree.core.msgnet.nodes.NM_HttpClient",
 		"org.iottree.core.msgnet.nodes.NM_TcpClientRR",
-		"org.iottree.core.msgnet.nodes.NM_RESTfulApi"
+		"org.iottree.core.msgnet.nodes.NM_RESTfulApi",
+		"org.iottree.ext.msg_net.MailSender_NM"
 	],"modules":[
 		{"cn":"org.iottree.ext.msg_net.Kafka_M","nodes":[
 			"org.iottree.ext.msg_net.KafkaIn_NS",

core/src/main/java/org/iottree/core/msgnet/nodes/NS_TagChgTrigger.java

@@ -30,7 +30,7 @@ public class NS_TagChgTrigger extends MNNodeStart
 	// String tagId = null ;
 	public static enum ChgTP
 	{
-		all_chg(0), all_valid_chg(1), up_down(2), up(3), down(4);
+		all_chg(0), all_valid_chg(1),up_down(2), up(3), down(4);
 
 		final int val;
 
@@ -119,22 +119,29 @@ public boolean checkChgTrigger(UAVal last_v, boolean cur_valid, Object curval)
 			Object lastv = null;
 			if (last_v != null && last_v.isValid())
 				lastv = last_v.getObjVal();
-			if (lastv == null || !lastv.equals(curval))
+			if (lastv == null)
 			{
-				switch (this)
+				if(curval!=null)
 				{
-				case all_chg:
-				case all_valid_chg:
-					return true;
-				default:
-					return false;
+					switch (this)
+					{
+					case all_chg:
+					case all_valid_chg:
+						return true;
+					default:
+						return false;
+					}
 				}
+				return false;
 			}
 
 			int comp_res = compareCurLastUpDown(curval, lastv);
 			// valid = true
 			switch (this)
 			{
+			case all_chg:
+			case all_valid_chg:
+				return comp_res != 0;
 			case up:
 				return comp_res > 0;
 			case down:

core/src/main/java/org/iottree/core/msgnet/store/influxdb/InfluxDB_Writer.java

@@ -270,6 +270,9 @@ private Point calPointFmt(MNMsg msg)
 				if(v==null)
 					continue ;
 
+				String vt = tmpjo.optString("vt") ;
+				v = transValByVT(vt,v) ;
+				
 				if(v instanceof Number)
 					point.addField(fn,(Number)v) ;
 				else if(v instanceof String)
@@ -304,6 +307,24 @@ else if(v instanceof Boolean)
 		return point ;
 	}
 
+	private Object transValByVT(String vt,Object v)
+	{
+		if(Convert.isNullOrEmpty(vt))
+			return v ;
+		
+		switch(vt)
+		{
+		case "float":
+			if(v instanceof Number)
+				return ((Number)v).floatValue() ;
+			break ;
+		case "double":
+			if(v instanceof Number)
+				return ((Number)v).doubleValue() ;
+		}
+		return v ;
+	}
+	
 	private transient long lastPtIn = -1 ;
 
 	private transient ArrayList<Point> ptBuf = new ArrayList<>() ;

core/src/main/java/org/iottree/core/station/PlatInsWSServer.java

@@ -277,8 +277,12 @@ public void onOpen(Session session,
 
 		PStation pss = PlatInsManager.getInstance().getStationById(stationid) ;
 
+		
 		if (pss == null)
 		{
+			if(log.isTraceEnabled())
+				log.trace("onOpen stationid="+stationid+"clientip="+clientip+" PStation is unknown");
+			
 			PlatInsManager.getInstance().fireUnknownStation(stationid) ;
 			session.close();
 			return;
@@ -309,6 +313,9 @@ public void onOpen(Session session,
 			}
 		}
 
+		if(log.isTraceEnabled())
+			log.trace("onOpen stationid="+stationid+"clientip="+clientip+" title="+pss.getTitle());
+		
 		SessionItem si = new SessionItem(session, pss,clientip);
 		addSessionItem(si);