From eb2d3e13885dfc2206f0a9c69a3e52aeab646917 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:33: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 | 11 ++++++-----
gx_tieta/WebRoot/dischargetest.jsp | 7 +++++--
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 10 +++++++---
gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java | 6 +++++-
gx_tieta/src/com/fgkj/services/BattInfServices.java | 3 ++-
5 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 10f87bd..5ec0d36 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -1483,7 +1483,8 @@
loading.showLoading();
flushDischargeParam({
num:CMD_GetDischargeParm,
- dev_id:$('#dev_id').val()
+ dev_id:$('#dev_id').val(),
+ TestCmd:0,
});
});
@@ -1591,7 +1592,8 @@
loading.showLoading($('#main'));
var param = {
num:cmd,
- dev_id:dev_id
+ dev_id:dev_id,
+ TestCmd:$('#discharge_type').val()
};
$.ajax({
type: "post",
@@ -1837,6 +1839,7 @@
updateUserDevinfo(); //璁剧疆鏀剧數鍙傛暟鎴愬姛鍚庝慨鏀圭敤鎴锋坊鍔犵殑鏀剧數璁惧淇℃伅
flushDischargeParam({
num:CMD_GetDischargeParm,
+ TestCmd:$('#discharge_type').val(),
dev_id:$('#dev_id').val()
});
paramsBtn.startTest(true);
diff --git a/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java b/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java
index 44f085e..1a0ed38 100644
--- a/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java
+++ b/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java
@@ -37,5 +37,9 @@
final public static int DEV_POWER_CUT=3; //鍋滅數娴嬭瘯
final public static int DEV_RES_TEST=4; //鍐呴樆娴嬭瘯
final public static int DEV_KD_TEST=5; //kd娴嬭瘯
-
+
+ //bts鏀剧數娴嬭瘯椤甸潰涓殑娴嬭瘯绫诲瀷鐨勫搴斿叧绯�
+ final public static int CMD_TESTCMD_HR = 37; //鏍稿娴嬭瘯
+ final public static int CMD_TESTCMD_RES = 50; //鍐呴樆娴嬭瘯
+ final public static int CMD_TESTCMD_NULL = 0; //涓嶈缃祴璇曠被鍨�
}
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 32ef3a6..a6f7600 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
@@ -231,8 +231,8 @@
return list;
}
- //鏈烘埧鍛戒护鎿嶄綔璁惧鏃剁殑cmd鍜宎ck鏍￠獙
- public boolean sendCmdToFBS9100Dev(int cmd,int dev_id)
+ //鏈烘埧鍛戒护鎿嶄綔璁惧鏃剁殑cmd鍜宎ck鏍￠獙 test_type -->榛樿鍚姩娴嬭瘯鐨勭被鍨�
+ public boolean sendCmdToFBS9100Dev(int cmd,int test_type,int dev_id)
{
int m_cmd = cmd;
int m_cmd_ack = cmd;
@@ -245,9 +245,13 @@
case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
default: return false;
}
+ String sql_end = "";
+ if(test_type > 0 && cmd == FBS9100_ComBase.CMD_Start){ //鍚姩娴嬭瘯鏃舵湭鐐瑰嚮璁惧畾鍙傛暟鎸夐挳锛屼細鍑虹幇鍚姩鍐呴樆娴嬭瘯bug淇
+ sql_end = ",TestCmd="+test_type;
+ }
boolean res_exe = false;
String sql = "UPDATE db_ram_db.tb_fbs9100_setparam SET "
- + " op_cmd=? "
+ + " op_cmd=? " + sql_end
+ " WHERE dev_id=? ";
Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{m_cmd,dev_id});
if(true == bl)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index ff30955..83f7256 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -15,6 +15,7 @@
import com.fgkj.dao.BattTestData;
import com.fgkj.dao.BattinfGroupFactory;
import com.fgkj.dao.DAOHelper;
+import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.ProcessServerDao;
import com.fgkj.dao.impl.App_SysImpl;
import com.fgkj.dao.impl.BattInfImpl;
@@ -93,7 +94,7 @@
PreparedStatement ps=null;
boolean b=((BattInfImpl)dao).updateIp(obj);
if(b){
- boolean bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(binf.getNum(), binf.getFBSDeviceId());
+ boolean bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(binf.getNum(),FBS9100_ComBase.CMD_TESTCMD_NULL, binf.getFBSDeviceId());
if(bl){
//灏�6185鐨勬湇鍔¤涓洪噸鍚�
Process_survey process=new Process_survey();
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..a181cc3 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -4,6 +4,7 @@
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 +68,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("淇敼鎴愬姛!");
@@ -86,7 +87,7 @@
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 +106,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 +124,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 +145,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