pipIrr-SV.git - Gitblit

			@@ -71,7 +71,7 @@
			public void run() {
			try {
			while(true){
			if(!ServerProperties.startWork){
			if(!ServerProperties.startTcpConnectWork){
			Thread.sleep(100L);
			}else{
			try{
			@@ -83,10 +83,13 @@
			log.info("共模拟了" + totalRtuClientCount + "台RTU");

			Collection<MyThreadJob> collection = jobMap.values() ;
			int connectedCount = 0 ;
			for(MyThreadJob job : collection){
			connectServer(job) ;
			connectedCount++ ;
			log.info("当前建立与通信中间件连接的RTU数量为：" + connectedCount);
			}
			log.info("启动所有RTU连接通信中间件");
			log.info("所有RTU已与通信中间件建立连接");

			while (true){
			int noConnectedCount = checkConnected() ;
			@@ -98,7 +101,15 @@
			}
			}

			startJob() ;
			while (true){
			if(!ServerProperties.startRtuReportWork){
			Thread.sleep(100L);
			}else{
			startJob() ;
			break ;
			}
			}

			while(true){
			if(totalOverClientCount.longValue() >= totalRtuClientCount.longValue()){
			Long seconds = (System.currentTimeMillis() - startTime)/1000 ;
			@@ -176,30 +187,27 @@
			}

			private void startJob(){
			new Thread(new Runnable(){
			@Override
			public void run() {
			try {
			int notOverCount;
			while(true){
			notOverCount = 0 ;
			Collection<MyThreadJob> collection = jobMap.values() ;
			for(MyThreadJob job : collection){
			if(!job.isOver){
			notOverCount++ ;
			pool.putJob(job);
			}
			}
			if(notOverCount > 0){
			log.info("当前还有" + notOverCount + "台RTU未完成任务");
			Thread.sleep(ServerProperties.sendInterval * 1000);
			}else{
			break ;
			new Thread(() -> {
			try {
			int notOverCount;
			while(true){
			notOverCount = 0 ;
			Collection<MyThreadJob> collection = jobMap.values() ;
			for(MyThreadJob job : collection){
			if(!job.isOver){
			notOverCount++ ;
			pool.putJob(job);
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			if(notOverCount > 0){
			log.info("当前还有" + notOverCount + "台RTU未完成任务");
			Thread.sleep(ServerProperties.sendInterval * 1000);
			}else{
			break ;
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}).start();
			}
			@@ -209,16 +217,16 @@
			totalSendDataCount++;
			if(totalOverClientCount.longValue() >= totalRtuClientCount.longValue()){
			RmiClUnit.getInstance().reportHadReportCount(totalSendDataCount);
			System.out.println("已经发送" + totalSendDataCount + "条数据");
			System.out.println("已经发送" + totalSendDataCount + "条数据（心跳和上报）");
			}else{
			if(totalRtuClientCount > 100){
			if(totalSendDataCount % 100 == 0){
			RmiClUnit.getInstance().reportHadReportCount(totalSendDataCount);
			System.out.println("已经发送" + totalSendDataCount + "条数据");
			System.out.println("已经发送" + totalSendDataCount + "条数据（心跳和上报）");
			}
			}else{
			RmiClUnit.getInstance().reportHadReportCount(totalSendDataCount);
			System.out.println("已经发送" + totalSendDataCount + "条数据");
			System.out.println("已经发送" + totalSendDataCount + "条数据（心跳和上报）");
			}
			}
			}