From 2f967bc373b23a48ff986a965155361a70bd2eb0 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期五, 04 一月 2019 15:40:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
index adae546..4fa7c94 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -1,5 +1,6 @@
package com.fgkj.services.ram;
+import java.util.Calendar;
import java.util.List;
import com.fgkj.dao.BaseDAO;
@@ -7,9 +8,11 @@
import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;
import com.fgkj.dao.impl.ram.Fbs9100_battparamImpl;
+import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.ram.Bts_gprs_state;
import com.fgkj.dto.ram.Fbs9100_battparam;
+import com.fgkj.dto.ram.Fbs9100_sysparam;
public class Fbs9100_battparamService {
private BaseDAO dao;
@@ -40,6 +43,45 @@
return model;
}
+ //鎵归噺璁剧疆鐢垫睜鍙傛暟
+ public ServiceModel updatePro(Object obj) {
+ boolean bl=((Fbs9100_battparamImpl)dao).updatePro(obj);
+ if(bl) {
+ List<Fbs9100_battparam> list=(List<Fbs9100_battparam>) 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_battparam fs=new Fbs9100_battparam();
+ fs=list.get(i);
+ if(fs.getNum()==0) {//鍓嶅彴浼犲弬璁剧疆
+ boolean b=((Fbs9100_battparamImpl)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;
+ }
//鏍规嵁璁惧id鏌ヨ鐢垫睜鍙傛暟淇℃伅
public ServiceModel serchByCondition(Object obj) {
List list=dao.serchByCondition(obj);
--
Gitblit v1.9.1