From 104cf721e069d81f0874b32465a273d8e63e539c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 10:37:44 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java |  106 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 85 insertions(+), 21 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
index 476d997..7477d1a 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
@@ -1,6 +1,7 @@
 package com.fgkj.services.ram;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 import com.fgkj.dao.BaseDAO;
@@ -9,6 +10,7 @@
 import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl;
 import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;
 import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.ram.Fbs9100_setparam;
 import com.fgkj.dto.ram.Fbs9100_sysparam;
 
 public class Fbs9100_sysparamService {
@@ -23,41 +25,103 @@
 	//淇敼绯荤粺鍙傛暟
 	public ServiceModel update(Object obj) {
 		Fbs9100_sysparam fbs_sys=(Fbs9100_sysparam) obj;
-		Boolean b=dao.update(obj);
 		boolean bl=false;
-		if(b){
-			if(fbs_sys.getNum()==FBS9100_ComBase.CMD_ResetSystem){//閲嶅惎
-				bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(fbs_sys.getNum(),0, fbs_sys.getDev_id());
-			}else{
-				bl=((Fbs9100_sysparamImpl)dao).sendCmdToFBS9100Dev(fbs_sys.getNum(), fbs_sys.getDev_id());
-			}
+		if(fbs_sys.getNum()==FBS9100_ComBase.CMD_ResetSystem){//閲嶅惎
+			bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(fbs_sys.getNum(),0, fbs_sys.getDev_id());
 			if(bl){
 				model.setCode(1);
-				model.setMsg("淇敼鎴愬姛!");
+				model.setMsg("閲嶅惎鎴愬姛!");
 		    }else{
 		    	model.setCode(0);
-				model.setMsg("璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+				model.setMsg("閲嶅惎澶辫触!");
 		    }
 		}else{
-			model.setCode(0);
-			model.setMsg("淇敼澶辫触!");
-		}	
+			Boolean b=dao.update(obj);
+			if(b){
+				bl=((Fbs9100_sysparamImpl)dao).sendCmdToFBS9100Dev(fbs_sys.getNum(), fbs_sys.getDev_id());
+				if(bl){
+					model.setCode(1);
+					model.setMsg("淇敼鎴愬姛!");
+			    }else{
+			    	model.setCode(0);
+					model.setMsg("璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+			    }
+			}else{
+				model.setCode(0);
+				model.setMsg("淇敼澶辫触!");
+			}	
+		}
+		
 		return model;	
 	}
 	
 	//鏍规嵁璁惧id鏌ヨ绯荤粺鍙傛暟(涓�瀹氭槸琚鐞嗙殑)
     public ServiceModel serchByCondition(Object obj){
-        List list = dao.serchByCondition(obj);
-		if(list!=null && list.size()>0){
-			model.setCode(1);
-			model.setData(list);
-			model.setMsg("鏌ヨ鎴愬姛!");
-		}else{
-			model.setCode(0);
+    	Fbs9100_sysparam sys=(Fbs9100_sysparam) obj;
+    	boolean bl=((Fbs9100_sysparamImpl)dao).replace(obj);
+    	boolean b=((Fbs9100_sysparamImpl)dao).sendCmdToFBS9100Dev(FBS9100_ComBase.CMD_GetSYSSetParam, sys.getDev_id());
+    	if(b){
+    		List list = dao.serchByCondition(obj);
+    		if(list!=null && list.size()>0){
+    			model.setCode(1);
+    			model.setData(list);
+    			model.setMsg("鏌ヨ鎴愬姛!");
+    		}else{
+    			model.setCode(0);
+    			model.setMsg("鏌ヨ澶辫触!");
+    		}
+    	}else{
+    		model.setCode(0);
 			model.setMsg("鏌ヨ澶辫触!");
-		}
+    	}
+        
 		return model;
 	} 
-	
+  //鎵归噺璁剧疆绯荤粺鍙傛暟
+  	public ServiceModel updatePro(Object obj) {
+  		boolean bl=((Fbs9100_sysparamImpl)dao).updatePro(obj);
+  		if(bl) {
+  			List<Fbs9100_sysparam> list=(List<Fbs9100_sysparam>) 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_sysparam fs=new Fbs9100_sysparam();
+  					fs=list.get(i);
+  					if(fs.getNum()==0) {//鍓嶅彴浼犲弬璁剧疆
+  						boolean b=((Fbs9100_sysparamImpl)dao).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
+  						if(b) {
+  							success+=1;
+  							list.get(i).setNum(1);
+  						}
+  					}
+  				}
+  				if(success==list.size()) {
+  					break;
+  				}
+  				Calendar cl = Calendar.getInstance(); 
+  				long moment_time = cl.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;	
+  	}
 
+    public static void main(String[] args) {
+		Fbs9100_sysparamService fs=new Fbs9100_sysparamService();
+		Fbs9100_sysparam sys=new Fbs9100_sysparam();
+		sys.setDev_id(910000001);
+		ServiceModel model=fs.serchByCondition(sys);
+		System.out.println(model);
+	}
 }

--
Gitblit v1.9.1