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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-08 72f6dd64e2250c793ccfb289dd523ef7fab4b2bf

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

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class

Binary files differ

 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java

@@ -60,7 +60,13 @@
        return SUCCESS;    

    }

    

	
    //批量读取电池参数

    public String readPL() {

        List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());

        ServiceModel model = service.readPL(list);

        result = tojson(model);		
        return SUCCESS;	
    }

    

    

    


 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java

@@ -75,6 +75,29 @@
        (new User_logService()).addPro(listU);//将用户的操作记录下来

        return bl;

    }

    //批量读取电池参数

    public boolean readPL(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,op_cmd) "

                        + " values("+fs.getDev_id()+","+fs.getOp_cmd()+")";

                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;


 gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java

@@ -161,6 +161,45 @@
        }

        return model;

    }

    //批量读取电池参数

    public ServiceModel readPL(Object obj) {

        boolean bl=((Fbs9100_battparamImpl)dao).readPL(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;	
    }

    public static void main(String[] args) {

        Fbs9100_battparamService service=new Fbs9100_battparamService();

        BattInf binf=new BattInf();