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 ++++++++++++++++++++-
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 41 ++++++++++++++++----
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java | 8 +++
3 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
index e9efda0..039d68b 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -52,11 +52,17 @@
//鎵归噺璁剧疆鏀剧數鍙傛暟
public String updatePro() {
List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());
- Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);
ServiceModel model = service.updatePro(list);
result = tojson(model);
return SUCCESS;
}
+ //鎵归噺鏀剧數
+ public String updatePro_dis() {
+ List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());
+ ServiceModel model = service.updatePro_dis(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
//鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟
public String updateld6Param(){
Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
index 93c686a..da9e53f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -107,6 +107,29 @@
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
+ //鎵归噺鏀剧數
+ public boolean updatePro_dis(Object obj) {
+ List<Fbs9100_setparam> list=(List<Fbs9100_setparam>) obj;
+ ArrayList sql_str=new ArrayList();
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100_setparam fs=list.get(i);
+ String sql="UPDATE db_ram_db.tb_fbs9100_setparam SET "
+ + " op_cmd="+fs.getOp_cmd()+ ",TestCmd="+fs.getTestCmd()+ " WHERE dev_id= "+fs.getDev_id();
+ sql_str.add(sql);
+ {
+ String msg="鍚姩"+fs.getDev_id()+"鏈烘埧鏀剧數鍙傛暟";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ listU.add(ulog);
+ }
+ }
+ }
+
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ return bl;
+ }
//淇敼鏀剧數鍙傛暟琛ㄤ腑ld6
public boolean updateld6Param(Object obj) {
Fbs9100_setparam fs=(Fbs9100_setparam) obj;
@@ -346,17 +369,17 @@
try {
ps = conn.prepareStatement(sql);
rs=ps.executeQuery();
- if(rs.next())
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
{
- if(rs.getInt("op_cmd") == m_cmd_ack)
- {
- res_exe = true;
- }
- }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ res_exe = true;
+ }
}
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
DBUtil.close(rs, ps, conn);
return res_exe;
}
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