Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-10-25 eb2d3e13885dfc2206f0a9c69a3e52aeab646917

 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);