From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 da01aa9..11fa11d 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -1,9 +1,11 @@
package com.fgkj.services.ram;
+import java.util.Calendar;
import java.util.List;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Batt_rtdataDAOImpl;
import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl;
@@ -67,7 +69,7 @@
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
Boolean b=dao.update(obj);
if(b){
- boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(), fsparam.getDev_id());
+ boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(),fsparam.getTestCmd(), fsparam.getDev_id());
if(bl){
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
@@ -81,12 +83,46 @@
}
return model;
}
+ //鎵归噺璁剧疆鏀剧數鍙傛暟
+ public ServiceModel updatePro(Object obj) {
+ boolean bl=((Fbs9100_setparamImpl)dao).updatePro(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=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);
+ }
+ }
+ }
+ long moment_time = c.getTimeInMillis();
+ time=moment_time=now_time;
+ }while(time<=5);
+ 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;
Boolean b=((Fbs9100_setparamImpl)dao).updateld6Param(obj);
if(b){
- boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(), fsparam.getDev_id());
+ boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(),fsparam.getTestCmd(),fsparam.getDev_id());
if(bl){
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
@@ -105,7 +141,7 @@
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
Boolean b=((Fbs9100_setparamImpl)dao).update61850Param(obj);
if(b){
- boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(), fsparam.getDev_id());
+ boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(),fsparam.getTestCmd(),fsparam.getDev_id());
if(bl){
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
@@ -123,7 +159,7 @@
//鍙抽敭鏌ョ湅鍙傛暟鍜屽脊鍑烘鐨勫埛鏂版寜閽�
public ServiceModel serchbyDev_id(Object obj) {
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
- boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(), fsparam.getDev_id());
+ boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(fsparam.getNum(),fsparam.getTestCmd(),fsparam.getDev_id());
//System.out.println(fsparam.getDev_id()+" "+bl);
List list=((Fbs9100_setparamImpl)dao).serchbyDev_id(obj);
if(bl){
@@ -144,7 +180,7 @@
public ServiceModel serchByCondition(Object obj){
BattInf binf=(BattInf) obj;
int dev_id=(new BattInfImpl()).serchDev_id(binf);
- boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(binf.getNum(), dev_id);
+ boolean bl=((Fbs9100_setparamImpl)dao).sendCmdToFBS9100Dev(binf.getNum(),FBS9100_ComBase.CMD_TESTCMD_NULL, dev_id);
List list=dao.serchByCondition(obj);
if(bl){
model.setCode(1);
--
Gitblit v1.9.1