From 4cfef11f5d6a7a328fae29a60ea77f5f78c6923f Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 28 十二月 2018 14:34:44 +0800
Subject: [PATCH] 批量放电和批量设置参数的修改

---
 gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
index 7e76d87..c56a222 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -1,5 +1,6 @@
 package com.fgkj.services.ram;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
@@ -95,12 +96,13 @@
 			int success=0;
 			do {
 				for (int i = 0; i < list.size(); i++) {
-					Fbs9100_setparam fs=list.get(i);
-					if(fs.getNum()==0) {
+					Fbs9100_setparam fs=new Fbs9100_setparam();
+					fs=list.get(i);
+					if(fs.getNum()==0) {//鍓嶅彴浼犲弬璁剧疆
 						boolean b=((Fbs9100_setparamImpl)dao).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
 						if(b) {
 							success+=1;
-							fs.setNum(1);
+							list.get(i).setNum(1);
 						}
 					}
 				}
@@ -117,6 +119,41 @@
 		}
 		return model;	
 	}
+	//鎵归噺鏀剧數
+	public ServiceModel updatePro_dis(Object obj) {
+		boolean bl=((Fbs9100_setparamImpl)dao).updatePro_dis(obj);
+		if(bl) {
+			List<Fbs9100_setparam> list=(List<Fbs9100_setparam>) obj;
+			Calendar c = Calendar.getInstance(); 
+			//鐜板湪鐨勬椂闂�(鍗曚綅锛氭绉�) 
+			long now_time = c.getTimeInMillis();
+			long time=0;
+			int success=0;
+			do {
+				for (int i = 0; i < list.size(); i++) {
+					Fbs9100_setparam fs=new Fbs9100_setparam();
+					fs=list.get(i);
+					if(fs.getNum()==0) {//鍓嶅彴浼犲弬璁剧疆
+						boolean b=((Fbs9100_setparamImpl)dao).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
+						if(b) {
+							success+=1;
+							list.get(i).setNum(1);
+						}
+					}
+				}
+				long moment_time = c.getTimeInMillis();
+				time=moment_time-now_time;
+			}while(time<=5*1000);
+			model.setData(list);
+			model.setCode(1);
+			model.setSum(success);
+			model.setMsg("鍚姩鏀剧數鎴愬姛!");
+		}else {
+			model.setCode(0);
+			model.setMsg("鍚姩鏀剧數澶辫触!");
+		}
+		return model;	
+	}
 	//鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟
 	public ServiceModel updateld6Param(Object obj){
 		Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;

--
Gitblit v1.9.1