| gx_tieta/WebRoot/dischargetest.jsp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| gx_tieta/src/com/fgkj/services/BattInfServices.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); 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; //不设置测试类型 } gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -231,8 +231,8 @@ return list; } //机房命令操作设备时的cmd和ack校验 public boolean sendCmdToFBS9100Dev(int cmd,int dev_id) //机房命令操作设备时的cmd和ack校验 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) 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(); 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);
