From 61bbe5440372ed390e289d1399ff8e05fcbfac78 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 04 一月 2019 15:30:19 +0800
Subject: [PATCH] 批量系统参数和批量电池参数
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java | 42 ++++++++++++++
gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java | 44 ++++++++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class | 0
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java | 8 ++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java | 64 +++++++++++++++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java | 3
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class | 0
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java | 10 +++
16 files changed, 167 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
new file mode 100644
index 0000000..828344b
--- /dev/null
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
index 09e4c55..854c02d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class
new file mode 100644
index 0000000..0f8737d
--- /dev/null
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
index 4686079..d6f4972 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
index 16fc4cb..d5a8013 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
index dc9d5a7..74e4c6d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class
index d771bf3..6bca32f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class
index e8abf52..47fb539 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
index 5b2d12e..7efcebd 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
index 08010a1..5a12673 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
index f0b43c8..8aaa584 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -8,8 +8,10 @@
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.Fbs9100_battparam;
+import com.fgkj.dto.ram.Fbs9100_sysparam;
import com.fgkj.services.User_logService;
import com.fgkj.services.ram.Fbs9100_battparamService;
+import com.google.gson.reflect.TypeToken;
public class Fbs9100_battparamAction extends ActionUtil{
private Fbs9100_battparamService service=new Fbs9100_battparamService();
@@ -42,7 +44,13 @@
}
-
+ //鎵归噺璁剧疆鐢垫睜鍙傛暟
+ public String updatePro() {
+ List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());
+ ServiceModel model = service.updatePro(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
index 7375060..c0fc548 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
@@ -38,6 +38,14 @@
result = tojson(model);
return SUCCESS;
}
+ //鎵归噺璁剧疆绯荤粺鍙傛暟
+ public String updatePro() {
+ List<Fbs9100_sysparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_sysparam>>(){}.getType());
+ ServiceModel model = service.updatePro(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
+
//鏍规嵁璁惧id鏌ヨ绯荤粺鍙傛暟(涓�瀹氭槸琚鐞嗙殑)
public String serchByCondition(){
Fbs9100_sysparam sys= getGson().fromJson(json, Fbs9100_sysparam.class);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
index 1b23589..809a553 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
@@ -11,8 +11,12 @@
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.FBS9100_ComBase;
+import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
+import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.Fbs9100_battparam;
+import com.fgkj.dto.ram.Fbs9100_sysparam;
+import com.fgkj.services.User_logService;
import com.mysql.fabric.xmlrpc.base.Array;
public class Fbs9100_battparamImpl implements BaseDAO,CallBack{
@@ -36,7 +40,31 @@
,bparam.getBattTemp(),bparam.getFloatChargeVol(),bparam.getFloatChargeCurr(),bparam.getOnlineVolLow(),bparam.getGroupConnType()});
return bl;
}
-
+ //鎵归噺淇敼鐢垫睜鍙傛暟
+ public boolean updatePro(Object obj) {
+ List<Fbs9100_battparam> list=(List<Fbs9100_battparam>) 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_battparam fs=list.get(i);
+ String sql="replace into db_ram_db.tb_fbs9100_battparam(dev_id,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount"
+ + ",MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType) "
+ + " values("+fs.getDev_id()+",'"+fs.getDev_ip()+"',"+fs.getSTD_CAP()+","+fs.getSTD_RES()+","+fs.getBattGroupCount()+","+fs.getEachGroupBattCount()
+ +","+fs.getMonomerVol()+","+fs.getGroupVol()+","+fs.getBattTemp()+","+fs.getFloatChargeVol()+","+fs.getFloatChargeCurr()+","+fs.getOnlineVolLow()+","+fs.getGroupConnType()+")";
+ 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;
+ }
public boolean del(Object obj) {
// TODO Auto-generated method stub
return false;
@@ -145,6 +173,40 @@
}
return res_exe;
}
+
+ //鎵归噺璁剧疆鐢垫睜鍙傛暟鎴愬姛鍚庤鍙栧懡浠ょ殑ACK
+ public boolean getCmdAck(int cmd,int dev_id) {
+ int m_cmd = cmd;
+ int m_cmd_ack = cmd;
+ switch(m_cmd) {
+ case FBS9100_ComBase.CMD_GetBattParam: m_cmd_ack = FBS9100_ComBase.CMD_GetBattParamACK; break;
+ case FBS9100_ComBase.CMD_SetBattParam: m_cmd_ack = FBS9100_ComBase.CMD_SetBattParamACK; break;
+ default: return false;
+ }
+ String sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_battparam "+
+ " WHERE dev_id="+dev_id;
+ Connection conn=DBUtil.getConn();
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ boolean res_exe=false;
+ try {
+ ps = conn.prepareStatement(sql);
+ rs=ps.executeQuery();
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
+ {
+ res_exe = true;
+ }
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ DBUtil.close(rs, ps, conn);
+ return res_exe;
+ }
+
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java
index 06804d9..f52488e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java
@@ -49,7 +49,8 @@
Fbs9100_sysparam fs=list.get(i);
String sql="REPLACE into db_ram_db.tb_fbs9100_sysparam(dev_id,IPADDR,SubIPADDR,NetGateADDR,GroupVolRange,GroupVolSorce,CurrentRange,CurrentTyte,MonomerOrder,BackLightTime"
+ ",MACADDR,LoaderCount,DtCardCount,PowerBreakChargeCurr,MajorBattGroupNum,POF_BG_Boost_Cnt,POF_BG_Boost_VolStop,POF_BG_Boost_VolStart) "
- + " values()";
+ + " values("+fs.getDev_id()+",'"+fs.getIPADDR()+"','"+fs.getSubIPADDR()+"','"+fs.getNetGateADDR()+"',"+fs.getGroupVolRange()+","+fs.getGroupVolSorce()+","+fs.getCurrentRange()+","+fs.getCurrentTyte()+","+fs.getMonomerOrder()+","+fs.getBackLightTime()
+ +",'"+fs.getMACADDR()+"',"+fs.getLoaderCount()+","+fs.getDtCardCount()+","+fs.getPowerBreakChargeCurr()+","+fs.getMajorBattGroupNum()+","+fs.getPOF_BG_Boost_Cnt()+","+fs.getPOF_BG_Boost_VolStop()+","+fs.getPOF_BG_Boost_VolStart()+")";
sql_str.add(sql);
{
String msg="淇敼"+fs.getDev_id()+"鏈烘埧绯荤粺鍙傛暟";
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);
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 7b5e781..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 {
@@ -75,7 +77,47 @@
return model;
}
- public static void main(String[] args) {
+ //鎵归噺璁剧疆绯荤粺鍙傛暟
+ 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);
--
Gitblit v1.9.1