海尔二期
parent: 8646ec57 | 补丁 | 提交 | show whitespace
wu
2025-03-19 1d0a4978574e2b67b4ed04783465710978dbdaba 
导入S7JAR包，更改数据库连接
16个文件已修改
261 ■■■■■ 已修改文件
gmms/.classpath 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/.settings/org.eclipse.jdt.core.prefs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/bdg.jsp 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/index.jsp 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/mysqlInsert/mysql_connect.jsp 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/.classpath 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/.idea/encodings.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/bin/META-INF/MANIFEST.MF 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/nglib.iml 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/META-INF/MANIFEST.MF 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/builder/MachineManager.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/builder/Manager.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/builder/PaibanManager.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/builder/ThreadHttpServer.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/ng/db/DBHelper.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
nglib/src/ng/db/DBSession.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 gmms/.classpath


@@ -13,6 +13,5 @@


    </classpathentry>


    <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>


    <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>


    <classpathentry kind="lib" path="D:/Mes/s7connector-2.1.jar"/>


    <classpathentry kind="output" path="build/classes"/>


</classpath>




 gmms/.settings/org.eclipse.jdt.core.prefs


@@ -1,7 +1,7 @@


eclipse.preferences.version=1


org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled


org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8


org.eclipse.jdt.core.compiler.compliance=1.8


org.eclipse.jdt.core.compiler.problem.assertIdentifier=error


org.eclipse.jdt.core.compiler.problem.enumIdentifier=error


org.eclipse.jdt.core.compiler.source=1.8


org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1


org.eclipse.jdt.core.compiler.compliance=1.3


org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore


org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore


org.eclipse.jdt.core.compiler.source=1.3




 gmms/WebContent/login/bdg.jsp


@@ -6,6 +6,7 @@


response.setContentType("text/html; charset=utf-8");


%>




<%@ page import="com.mysql.cj.jdbc.Driver" %>


<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">


<html>


<head>




 gmms/WebContent/login/index.jsp


@@ -2,6 +2,7 @@


<%@page import="javax.swing.text.html.HTML"%>


<%@ page language="java" import="java.sql.*" contentType="text/html; charset=UTF-8"


    pageEncoding="UTF-8"%> 


    


    <%


request.setCharacterEncoding("UTF-8");


response.setCharacterEncoding("UTF-8");




 gmms/WebContent/mysqlInsert/mysql_connect.jsp


@@ -13,10 +13,10 @@


//连接数据库


String ip="localhost:3306";


 String driverClass = "com.mysql.cj.jdbc.Driver";


String url="jdbc:mysql://"+ip+"/gmms_haier?serverTimezone=GMT%2B8";


String url="jdbc:mysql://"+ip+"/haier?serverTimezone=GMT%2B8";


String user = "root"; 


 String password = "beibo.123/";   


String url1 = "jdbc:mysql://"+ip+"/gmms";


String url1 = "jdbc:mysql://"+ip+"/haier";




String urlglass="jdbc:mysql://"+ip+"/mesgglass?serverTimezone=GMT%2B8";


String url3="jdbc:mysql://"+ip+"/glog?serverTimezone=GMT%2B8";




 nglib/.classpath


@@ -5,5 +5,10 @@


    <classpathentry kind="lib" path="C:/Users/a&apos;a&apos;a/Desktop/Mes项目/repository/org/json/json/20080701/json-20080701.jar"/>


    <classpathentry kind="lib" path="D:/zyz/web_optima/GERP/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar"/>


    <classpathentry kind="lib" path="D:/zyz/web_optima/GERP/WebContent/WEB-INF/lib/jacob.jar"/>


    <classpathentry kind="lib" path="E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/iot-communication-1.4.2.jar"/>


    <classpathentry kind="lib" path="E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/jul-to-slf4j-1.7.28.jar"/>


    <classpathentry kind="lib" path="E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/logback-classic-1.2.3.jar"/>


    <classpathentry kind="lib" path="E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/logback-core-1.2.3.jar"/>


    <classpathentry kind="lib" path="E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/slf4j-api-1.7.28.jar"/>


    <classpathentry kind="output" path="bin"/>


</classpath>




 nglib/.idea/encodings.xml


@@ -4,6 +4,8 @@


    <file url="file://$PROJECT_DIR$/src/builder/HttpHandlerDemo.java" charset="GBK" />


    <file url="file://$PROJECT_DIR$/src/builder/MachineManager.java" charset="GBK" />


    <file url="file://$PROJECT_DIR$/src/builder/Manager.java" charset="GBK" />


    <file url="file://$PROJECT_DIR$/src/builder/ThreadHttpServer.java" charset="GBK" />


    <file url="file://$PROJECT_DIR$/src/ng/db/DBSession.java" charset="UTF-8" />


    <file url="file://$PROJECT_DIR$/src/toTcp/TCPClient.java" charset="GBK" />


    <file url="PROJECT" charset="GBK" />


  </component>




 nglib/bin/META-INF/MANIFEST.MF


@@ -1,3 +1,4 @@


Manifest-Version: 1.0


Main-Class: com.example.Main  # 主类全限定名


Main-Class: builder.Manager






 nglib/nglib.iml


@@ -16,33 +16,131 @@


    </content>


    <orderEntry type="jdk" jdkName="JavaSE-1.8" jdkType="JavaSDK" />


    <orderEntry type="sourceFolder" forTests="false" />


    <orderEntry type="module-library">


      <library name="json-20080701.jar">


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="file://C:/Users/a'a'a/Desktop/Mes项目/repository/org/json/json/20080701/json-20080701.jar" />


          <root url="jar://$MODULE_DIR$/../json-20230618.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library">


      <library name="mysql-connector-java-8.0.20.jar">


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="file://$MODULE_DIR$/../../zyz/web_optima/GERP/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar" />


          <root url="jar://$MODULE_DIR$/../mysql-connector-java-8.0.20.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library">


      <library name="jacob.jar">


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="file://$MODULE_DIR$/../../zyz/web_optima/GERP/WebContent/WEB-INF/lib/jacob.jar" />


          <root url="jar://$MODULE_DIR$/../jacob-1.18.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="library" name="fastjson-1.2.2" level="project" />


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://$MODULE_DIR$/../fastjson-1.2.2.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/iot-communication-1.4.2.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/jul-to-slf4j-1.7.28.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/logback-classic-1.2.3.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/logback-core-1.2.3.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/nglib.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://E:/HuaweiMoveData/Users/SNG-010/Desktop/海尔二期/slf4j-api-1.7.28.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://$MODULE_DIR$/../druid-1.1.12.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://$MODULE_DIR$/../commons-net-3.9.0.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://$MODULE_DIR$/../artemis-http-client-1.1.10.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


    <orderEntry type="module-library" exported="">


      <library>


        <CLASSES>


          <root url="jar://$MODULE_DIR$/../iot-communication-1.4.2.jar!/" />


        </CLASSES>


        <JAVADOC />


        <SOURCES />


      </library>


    </orderEntry>


  </component>


</module>




 nglib/src/META-INF/MANIFEST.MF


@@ -1,3 +1,4 @@


Manifest-Version: 1.0


Main-Class: com.example.Main  # 主类全限定名


Main-Class: builder.Manager






 nglib/src/builder/MachineManager.java


@@ -57,16 +57,18 @@


    


    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;


    }


@@ -113,8 +115,9 @@


                obj.put("count", it.serv.ioCount);  //放入读取次数


                    send=it.serv.lastSend;            


                    get=it.serv.lastGet;        


                    if(send==null)


                    if(send==null) {


                        send="---";


                    }


                    if(get==null){


                        get="---";


                    }


@@ -127,8 +130,9 @@


                obj.put("dev_state", it.serv.zhangtai);


                String st="线程未开启";


                if(it.serv!=null){


                    if(it.serv.isRunning())


                    if(it.serv.isRunning()) {


                    st="未连接";


                    }


                    if(it.serv.isOnLine()){


                        st="已连接";


                    }




 nglib/src/builder/Manager.java


@@ -1,18 +1,16 @@


package builder;




import java.io.BufferedWriter;


import java.io.OutputStreamWriter;


import java.net.Socket;


import java.sql.Connection;


import java.sql.PreparedStatement;


import java.sql.ResultSet;


import java.sql.SQLException;




import org.json.JSONArray;




import S7.S7control;


import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;


import ng.db.DBHelper;


import ng.db.DBSession;


import ng.devices.HexUtil;


import org.json.JSONArray;




import java.io.BufferedWriter;


import java.io.OutputStreamWriter;


import java.net.Socket;


import java.sql.ResultSet;




public class Manager {


    //设备管理器


@@ -84,32 +82,38 @@


            //读取设备列表


            DBHelper db=DBHelper.getDBHelper("mes");


            sn=DBHelper.getDBHelper("mes").createSession(false);


            sn.createSql("select id,machine_name,ip_address,port,flag,read_size,read_offset,function_type,flag from machine");


            sn.createSql("select id,machine_name,ip_address,port,flag,read_size,read_offset,function_type,flag from machine where id=78");


            ResultSet set= sn.query().getCurrentResult();


            //创建所有设备通讯


            while(set.next()){


               int id=(int)set.getLong(1);


               String name=set.getString(2);


               String ip=set.getString(3);


               int port=set.getInt(4);


               int flag=set.getInt(5);


               int readSize=set.getInt(6);


               int readOffset=set.getInt(7);


               byte functionType=set.getByte(8);


               int flags=set.getInt(9);


               if(flags==1){


                   mmgr.createDevice(db,id,name,ip,port,readOffset,readSize,null,functionType);


               }


            System.out.println("S7链接");


            S7control s7=new S7control(EPlcType.S1500, "192.168.30.14", 102, 0, 0);


            System.out.println("S7:"+s7.readByte("DB34.0",  2));




            }	


//            //创建所有设备通讯


//            while(set.next()){


//               int id=(int)set.getLong(1);


//               String name=set.getString(2);


//               String ip=set.getString(3);


//               int port=set.getInt(4);


//               int flag=set.getInt(5);


//               int readSize=set.getInt(6);


//               int readOffset=set.getInt(7);


//               byte functionType=set.getByte(8);


//               int flags=set.getInt(9);


//               if(flags==1){


//                   mmgr.createDevice(db,id,name,ip,port,readOffset,readSize,null,functionType);


//               }


//


//            }


        }


        catch(Exception e){


            


        }


        finally{


            if(sn!=null)


            if(sn!=null){




                sn.close();


        }


        }


        mmgr.RunAll();


    }


    




 nglib/src/builder/PaibanManager.java


@@ -2,7 +2,6 @@


import java.io.IOException;


import java.util.Properties;




import ng.Algorithm.Layouts.*;


import ng.Algorithm.Layouts.AlgorithmDBInterface.ComputeResult;


import ng.db.NGFunction;




@@ -19,9 +18,7 @@


    //初始化排版管理器


    public void initPainbanManager(String url,String user,String password) throws IOException{        


        Properties properties = NGFunction.getProperties();


        String s= url+"&user="+


        user+"&password="+


         password;


        String s= url+"&user="+user+"&password="+password;


        System.out.println("l:"+s);


       ng.Algorithm.Layouts.AlgorithmDBInterface.initAlgorithm(s, lines);


    }




 nglib/src/builder/ThreadHttpServer.java


@@ -5,14 +5,20 @@


import java.util.concurrent.ExecutorService;


import java.util.concurrent.Executors;


 


import S7.S7control;


import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;


import com.sun.net.httpserver.*;




public class ThreadHttpServer  {


    //启动端口8080




    private static final int port=8880;


    private static final String Httpcontext="/demo";


    private static final int nThreads=8;


    public static void mains() {


        System.out.println("S7链接");


        S7control s7=new S7control(EPlcType.S1500, "192.168.30.14", 102, 0, 0);


        System.out.println("S7:"+s7.readByte("DB34.0",  2));


        HttpServer httpServer;


        try {


            httpServer=HttpServer.create(new InetSocketAddress(port),0);




 nglib/src/ng/db/DBHelper.java


@@ -12,11 +12,12 @@


import java.util.Properties;




import org.json.*;


import org.json.JSONArray;






public class DBHelper{


    


    private String sqlurl="jdbc:mysql://10.153.19.150/gmms";


    private String sqlurl="jdbc:mysql://localhost/haier";


    private String user="root";


    private String password="beibo.123/";


    static java.util.Hashtable<String, DBHelper> helper=new java.util.Hashtable<String, DBHelper>();


@@ -29,7 +30,7 @@


    public class ProcResult{


        public int code;


        public String Message;


        public JSONArray Datas;


        public org.json.JSONArray Datas;


    }


    


    public static DBSession createDBSession(String name,boolean manulcomit) throws Exception{


@@ -58,7 +59,7 @@


    }


    


    


    public  JSONArray query(boolean asObject,String sql,Object...params) throws SQLException, JSONException{


    public org.json.JSONArray query(boolean asObject, String sql, Object...params) throws SQLException, JSONException{


        DBSession sn=null;


        try{


            sn= createSession(false);


@@ -130,7 +131,7 @@


    


    


    


    public JSONArray query(String sql,Boolean RowAsObject,Object...params) throws SQLException, JSONException{


    public org.json.JSONArray query(String sql, Boolean RowAsObject, Object...params) throws SQLException, JSONException{


        DBSession sn=null;


        try{


            sn=this.createSession(false);


@@ -174,7 +175,7 @@


    




    


    //锟斤拷锟斤拷一锟斤拷锟斤拷in锟斤拷锟斤拷  锟斤拷锟斤拷out锟斤拷锟斤拷锟侥存储锟斤拷锟教ｏ拷一锟斤拷锟街讹拷锟斤拷int 1锟斤拷锟斤拷晒锟� 一锟斤拷锟斤拷String锟斤拷为一锟斤拷锟截革拷锟斤拷锟斤拷锟绞э拷锟绞憋拷锟轿拷锟绞撅拷锟较拷锟�


    //锟斤拷锟斤拷一锟斤拷锟斤拷in锟斤拷锟斤拷  锟斤拷锟斤拷out锟斤拷锟斤拷锟侥存储锟斤拷锟教ｏ拷一锟斤拷锟街讹拷锟斤拷int 1锟斤拷锟斤拷晒锟? 一锟斤拷锟斤拷String锟斤拷为一锟斤拷锟截革拷锟斤拷锟斤拷锟绞э拷锟绞憋拷锟轿拷锟绞撅拷锟较拷锟?


    public QueryResult SelectByProc(String name,String[] Params){


         Connection con=null;


          try{


@@ -324,7 +325,7 @@


           }


    }


    


    //通锟斤拷一锟斤拷锟斤拷锟斤拷取锟斤拷锟捷硷拷锟斤拷锟�


    //通锟斤拷一锟斤拷锟斤拷锟斤拷取锟斤拷锟捷硷拷锟斤拷锟?


    public QueryResult getQueryResult(String sql){


        QueryResult query=null;


        try{


@@ -452,7 +453,7 @@


    


    


    public static org.json.JSONArray resultToJson(String[] fields,ResultSet result,boolean RowAsObject) throws SQLException, JSONException{


        JSONArray arr=new JSONArray();


        org.json.JSONArray arr=new org.json.JSONArray();


  


         String[] cols=fields;




@@ -471,7 +472,7 @@


         }


         else{


             while(result.next()){


               JSONArray obj=new JSONArray();


                org.json.JSONArray obj=new org.json.JSONArray();


                for(int i=0;i<cols.length;i++){


                    Object o=result.getObject(i+1);


                if(o==null)


@@ -490,7 +491,7 @@




     //锟斤拷锟斤拷锟捷匡拷锟窖拷锟斤拷锟斤拷菁锟街憋拷锟阶拷锟轿狫sonArray, 锟斤拷锟絉owAsObject=true 每锟斤拷锟斤拷目锟斤拷锟斤拷锟斤拷为锟斤拷锟斤拷锟街讹拷锟斤拷锟斤拷jsonobject 锟斤拷锟斤拷每锟斤拷锟斤拷目锟斤拷锟斤拷一锟斤拷锟斤拷锟街讹拷锟斤拷锟斤拷 jsonarray锟斤拷锟斤拷


     public static org.json.JSONArray resultToJson(ResultSet result,boolean RowAsObject) throws SQLException, JSONException{


         JSONArray arr=new JSONArray();


        org.json.JSONArray arr=new org.json.JSONArray();


         ResultSetMetaData r= result.getMetaData();


          String[] cols=new String[r.getColumnCount()];




@@ -512,7 +513,7 @@


          }


          else{


              while(result.next()){


                JSONArray obj=new JSONArray();


                org.json.JSONArray obj=new JSONArray();


                 for(int i=0;i<cols.length;i++){


                     Object o=result.getObject(i+1);


                     if(o==null)




 nglib/src/ng/db/DBSession.java


@@ -2,10 +2,7 @@


import java.sql.*;


import java.util.*;


import org.json.*;










import org.json.JSONArray;






public class DBSession implements AutoCloseable {


@@ -56,7 +53,7 @@


           JSONObject obj=new JSONObject();


           int idx=1;


           do{


               JSONArray a=this.resultToJson(false);


                org.json.JSONArray a=this.resultToJson(false);


               obj.put("Table"+idx,a);


               idx++;


           }while(this.nextResult());


@@ -88,17 +85,17 @@


       }


       


       //����ǰ�Ľ����ֱ������JSON����


       public JSONArray resultToJson(boolean RowAsObject) throws SQLException, JSONException{


        public org.json.JSONArray resultToJson(boolean RowAsObject) throws SQLException, JSONException{


           return DBHelper.resultToJson(this.getCurrentResult(), RowAsObject);


       }


       


       public JSONArray resultToJson(String[] fields,boolean RowAsObject) throws SQLException, JSONException{


        public org.json.JSONArray resultToJson(String[] fields, boolean RowAsObject) throws SQLException, JSONException{


           return DBHelper.resultToJson(fields,this.getCurrentResult(), RowAsObject);


       }


       


       


       public List<JSONArray> allToJson(boolean RowAsObject) throws SQLException, JSONException{


           List<JSONArray> arrs=new ArrayList<JSONArray>();


        public List<org.json.JSONArray> allToJson(boolean RowAsObject) throws SQLException, JSONException{


            List<org.json.JSONArray> arrs=new ArrayList<JSONArray>();


           do{


               arrs.add(DBHelper.resultToJson(this.getCurrentResult(), RowAsObject));


           }while(this.nextResult());