wu
2025-04-22 a835b145693d2238d4d4a27d03c51f4197c4f77a
nglib/src/builder/MachineManager.java
@@ -29,12 +29,16 @@
      public String ProcName;
      public String Name;
      public byte FunctionType;
      public String remarks;
   
   }
   List<item> items=new ArrayList<item>();
   
   public void RunAll(){
      for(item it:items){
         System.out.println(it);
         Run(it.Name);
       
      }
@@ -49,7 +53,8 @@
      if(itm!=null){
         if(itm.serv==null){
            itm.serv=new MysqlService(itm.helper,itm.ID);
            itm.serv.Run(itm.ID,itm.IP,itm.Port, (byte)1,itm.ReadOffset, itm.ReadSize,1000,itm.FunctionType);
            itm.serv.Run(itm.ID,itm.IP,itm.Port, (byte)1,itm.ReadOffset, itm.ReadSize,1000,itm.FunctionType,itm.remarks);
            System.out.println(String.format("设备启动-{%s}(%s)(%s)",itm.Name,itm.IP,itm.FunctionType));
         }
      }
@@ -57,23 +62,25 @@
   
   private item innerGetItem(String name){
      for(int i=0;i<items.size();i++){
         if(name==items.get(i).Name)
         if(name==items.get(i).Name){
            return items.get(i);
         }
      }
      return null;
   }
   
   public item innerGetItem(int id){
      for(int i=0;i<items.size();i++){
         if(id==items.get(i).ID)
         if(id==items.get(i).ID){
            return items.get(i);
         }
      }
      return null;
   }
   
   
   
   public void createDevice(DBHelper helper,int DeviceID,String Name,String Ip,int Port,int ReadOffset,int ReadSize,String ProcName,byte FunctionType){
   public void createDevice(DBHelper helper,int DeviceID,String Name,String Ip,int Port,int ReadOffset,int ReadSize,String ProcName,byte FunctionType,String remarks){
      synchronized(items){
         
         item itm=new item();
@@ -86,6 +93,7 @@
         itm.ReadOffset=ReadOffset;      //读取偏移
         itm.ReadSize=ReadSize;//发送偏移
         itm.FunctionType=FunctionType;
         itm.remarks=remarks;
         /*if(DeviceID==6 || DeviceID==19 || DeviceID==29 || DeviceID==30){
            itm.ReadOffset=12000;
         }*/
@@ -113,8 +121,9 @@
            obj.put("count", it.serv.ioCount);  //放入读取次数
               send=it.serv.lastSend;         
               get=it.serv.lastGet;      
               if(send==null)
                  send="---";
               if(send==null) {
                  send = "---";
               }
               if(get==null){
                  get="---";
               }
@@ -127,8 +136,9 @@
            obj.put("dev_state", it.serv.zhangtai);
            String st="线程未开启";
            if(it.serv!=null){
                if(it.serv.isRunning())
               st="未连接";
                if(it.serv.isRunning()) {
                  st = "未连接";
               }
                if(it.serv.isOnLine()){
                   st="已连接";
                }