DyEnvir_system/.settings/org.jboss.tools.jst.web.xml
@@ -8,84 +8,90 @@ <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/> <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/> <file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/> <file-system NAME="lib-c3p0-0.9.5.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-mchange-commons-java-0.2.9.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-beanutils-1.7.0.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-codec-1.10.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-collections-3.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-dbcp-1.2.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-fileupload-1.2.2.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-io-2.0.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-lang-2.5.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-pool-1.2.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-dom4j-1.6.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-ezmorph-1.0.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-freemarker-2.3.16.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-gson-2.2.4.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-javassist-3.11.0.GA.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-json-lib-2.1-jdk15.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jstl-1.2.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jstl-1.2.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-ognl-3.0.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-poi-3.10.1-20140818.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-sqljdbc.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-struts2-core-2.2.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-struts2-json-plugin-2.2.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-struts2-sunspoter-stream-1.0.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-xwork-core-2.2.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jsf-api.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jsf-api.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jsf-impl.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jsf-impl.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jacob.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-tomcat7-websocket.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\lib\tomcat7-websocket.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-websocket-api.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\lib\websocket-api.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-json-20150729.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\json-20150729.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcmail-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcmail-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcpg-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcpg-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcpkix-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcpkix-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcprov-ext-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcprov-ext-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcprov-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcprov-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bctls-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bctls-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-javaee.jar" location="D:\myelipse\install\plugins\com.genuitec.eclipse.j2eedt.core_13.0.0.me201412191642\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-c3p0-0.9.5.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-mchange-commons-java-0.2.9.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-beanutils-1.7.0.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-codec-1.10.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-collections-3.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-dbcp-1.2.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-fileupload-1.2.2.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-io-2.0.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-lang-2.5.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-pool-1.2.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-dom4j-1.6.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-ezmorph-1.0.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-freemarker-2.3.16.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-gson-2.2.4.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-javassist-3.11.0.GA.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-json-lib-2.1-jdk15.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jstl-1.2.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jstl-1.2.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-ognl-3.0.1.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-poi-3.10.1-20140818.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-sqljdbc.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-struts2-core-2.2.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-struts2-json-plugin-2.2.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-struts2-sunspoter-stream-1.0.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-xwork-core-2.2.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jsf-api.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jsf-api.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jsf-impl.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jsf-impl.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jacob.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-tomcat7-websocket.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\tomcat7-websocket.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-websocket-api.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\websocket-api.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-json-20150729.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\json-20150729.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcmail-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcmail-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcpg-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcpg-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcpkix-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcpkix-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcprov-ext-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcprov-ext-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bcprov-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bcprov-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-bctls-jdk15on-161.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\WebRoot\WEB-INF\lib\bctls-jdk15on-161.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-lang3-3.11.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\commons-lang3-3.11.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-modbus4j-3.0.4-SNAPSHOT.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\modbus4j-3.0.4-SNAPSHOT.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-logging-1.1.3.jar" location="D:\GitWorkSpace\DyEnvir_system\DyEnvir_system\lib\commons-logging-1.1.3.jar" model-entity="FileSystemJar"/> <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml"> <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/> DyEnvir_system/src/com/fgkj/actions/electric2mwsystem/Electric_Control_Single_2kwAction.java
@@ -18,16 +18,23 @@ return SUCCESS; } //根据2MW电源id读取控制信息 /* //根据2MW电源id读取控制信息 public String updatePLC() { Electric_Control_Single_2kw econ=ActionUtil.getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Electric_Control_Single_2kw.class); ServiceModel model=service.updatePLC(econ); result=tojson(model); return SUCCESS; }*/ //根据2MW电源id读取控制信息 public String update() { Electric_Control_Single_2kw econ=ActionUtil.getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Electric_Control_Single_2kw.class); ServiceModel model=service.update(econ); result=tojson(model); return SUCCESS; }
@@ -14,9 +14,9 @@ //电源系统组合控制 public String update() { Electric_control_conn econn=getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Electric_control_conn.class); //ServiceModel model=service.update(econn); ServiceModel model=service.update(econn); //电源系统组合控制<直接控制PLC点位> ServiceModel model=service.updatePLC(econn); //ServiceModel model=service.updatePLC(econn); result=tojson(model); return SUCCESS; } DyEnvir_system/src/com/fgkj/actions/electricsystem/Electric_control_singleAction.java
@@ -13,9 +13,9 @@ //电源系统单点控制 public String update() { Electric_control_single ecs=getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Electric_control_single.class); //ServiceModel model=service.update(ecs); ServiceModel model=service.update(ecs); //电源系统单点控制<直接控制PLC点位> ServiceModel model=service.updatePLC(ecs); //ServiceModel model=service.updatePLC(ecs); result=tojson(model); return SUCCESS; } DyEnvir_system/src/com/fgkj/dao/BaseDAO.java
@@ -86,6 +86,8 @@ public static final int TMPHUM_RT=43; public static final int ELECTRIC_STATE_2KW=44; public boolean add(Object obj); // 添加 public boolean update(Object obj); // 更新 DyEnvir_system/src/com/fgkj/dao/BaseDAOFactory.java
@@ -22,6 +22,7 @@ import com.fgkj.electric2mwsystem.Impl.Electric2MW_infImpl; import com.fgkj.electric2mwsystem.Impl.Electric_Control_Single_2kwImpl; import com.fgkj.electric2mwsystem.Impl.Electric_Rt_2kwImpl; import com.fgkj.electric2mwsystem.Impl.Electric_State_2kwImpl; import com.fgkj.electricsystem.Impl.Electric_alarmImpl; import com.fgkj.electricsystem.Impl.Electric_alarm_historyImpl; import com.fgkj.electricsystem.Impl.Electric_control_connImpl; @@ -101,6 +102,7 @@ case 41:return new Electric_Rt_2kwImpl(); case 42:return new Electric_Control_Single_2kwImpl(); case 43:return new Tmphum_rtImpl(); case 44:return new Electric_State_2kwImpl(); default :return null; } } DyEnvir_system/src/com/fgkj/db/DBUtil.java
@@ -21,10 +21,10 @@ private static String username="root"; private static String password="lmx8688139"; private static String url="jdbc:mysql://118.89.139.230:3360/db_user"; //private static String url="jdbc:mysql://118.89.139.230:3360/db_user"; //private static String url="jdbc:mysql://123.207.82.239:3360/db_user"; //private static String url="jdbc:mysql://192.168.10.221:3360/db_user"; //private static String url="jdbc:mysql://127.0.0.1:3360/db_user"; private static String url="jdbc:mysql://127.0.0.1:3360/db_user"; /*private static String username="root"; private static String password="123456";*/
@@ -26,10 +26,18 @@ // TODO Auto-generated method stub return false; } //单点控制 @Override public boolean update(Object obj) { // TODO Auto-generated method stub Electric_Control_Single_2kw econ=(Electric_Control_Single_2kw) obj; switch (econ.getNum()) { case 1: break; default: break; } return false; } @@ -44,7 +52,7 @@ // TODO Auto-generated method stub return null; } //根据2MW电源id读取控制信息 /*//根据2MW电源id读取控制信息 @Override public List serchByCondition(Object obj) { Electric_Control_Single_2kw econ=(Electric_Control_Single_2kw) obj; @@ -89,11 +97,17 @@ }); return list; } */ @Override public List serchByInfo(Object obj) { // TODO Auto-generated method stub return null; } @Override public List serchByCondition(Object obj) { // TODO Auto-generated method stub return null; } } DyEnvir_system/src/com/fgkj/electric2mwsystem/Impl/Electric_Rt_2kwImpl.java
@@ -73,6 +73,7 @@ e2.setOthermode(rs.getInt("othermode")); e2.setConsvol_distribution(rs.getInt("consvol_distribution")); e2.setLocal_remote_control(rs.getInt("local_remote_control")); e2.setPulse_blocking(rs.getInt("pulse_blocking")); e2.setCurve_charge_mode(rs.getInt("curve_charge_mode")); e2.setStart_curve_charge_mode(rs.getInt("start_curve_charge_mode")); e2.setStop_curve_charge_mode(rs.getInt("stop_curve_charge_mode")); DyEnvir_system/src/com/fgkj/electric2mwsystem/Service/Electric_Control_Single_2kwService.java
@@ -40,7 +40,7 @@ boolean bl=false; BaseData basedata=null; byte[] b=null; try { /*try { switch (econ.getNum()) { case 1: basedata = new BaseData(Modbus_ComBase.WRITE_SINGLE_REGISTER, 330,1); b=basedata.createSingleResWiriteData(basedata.createIntByte((int)econ.getConsvolmode_chargecurr())); @@ -132,6 +132,7 @@ bl=false; e.printStackTrace(); } */ if(bl){ model.setCode(1); model.setMsg("写入成功"); @@ -142,4 +143,16 @@ return model; } //2MW电源单点控制 public ServiceModel update(Object obj) { boolean bl=dao.update(obj); if(bl){ model.setCode(1); model.setMsg("写入成功"); } else{ model.setCode(0); model.setMsg("写入失败"); } return model; } } DyEnvir_system/src/com/fgkj/electric2mwsystem/dto/Electric_Control_Single_2kw.java
@@ -5,280 +5,226 @@ public class Electric_Control_Single_2kw implements Serializable{ public int num ;//'主键', public int electric2KW_id ;//'电源id', public int upper_pulse_block; //上位机脉冲封锁 public int remote_start; //远程启动 public int fault_reset; //故障复位 public int conscurrswitch; //恒流切换 public int constantvol; //4并或2串2并恒压 public int volset_confirm; //电压给定确认 public int currset_confirm; //电流给定确认 public int remote_stop; //远程停止 public int start_screen_set; //启动触摸屏给定 public int start_upper_set; //启动上位机给定 public int consvolswitch; //恒压切换 public int othermode; //4并或2串2并以外模式 public int consvol_distribution; //四串恒压电压分配位 public float consvolmode_chargecurr ;// '转为恒压模式充电电压值', public float chargecurr_five ;// '第5阶段充电电流值', public float chargecurr_four ;// '第4阶段充电电流值', public float chargecurr_three ;// '第3阶段充电电流值', public float chargecurr_two ;// '第2阶段充电电流值', public float chargecurr_one ;// '第1阶段充电电流值', public float chargecurr_two ; // '第2阶段充电电流值', public float chargecurr_three ; // '第3阶段充电电流值', public float chargecurr_four ; // '第4阶段充电电流值', public float chargecurr_five ; // '第5阶段充电电流值', public float currset ;// '电流设定值', public float localgivecurr ;// '当前给定电流', public float volset ;// '电压设定值', public float localgivevol ;// '当前给定电压', public float controlangle ;// '控制角', public float stopchargevol_five ;// '第5阶段充电终止电压', public float stopchargevol_four ;// '第4阶段充电终止电压', public float stopchargevol_three ;// '第3阶段充电终止电压', public float stopchargevol_two ;// '第2阶段充电终止电压', public float stopchargevol_one ;// '第1阶段充电终止电压', public float alldccurr ;// '总直流电流', public float alldcvol ;// '总直流电压', public float brachdccurr ;// '分直流电流', public float brachdcvol ;// '分直流电压', public String electric2KW_ip; public float stopchargevol_two ; // '第2阶段充电终止电压', public float stopchargevol_three ; // '第3阶段充电终止电压', public float stopchargevol_four ; // '第4阶段充电终止电压', public float stopchargevol_five ; // '第5阶段充电终止电压', public int getNum() { return num; } public void setNum(int num) { this.num = num; } public int getElectric2KW_id() { return electric2KW_id; } public void setElectric2KW_id(int electric2kw_id) { electric2KW_id = electric2kw_id; } public int getUpper_pulse_block() { return upper_pulse_block; } public void setUpper_pulse_block(int upper_pulse_block) { this.upper_pulse_block = upper_pulse_block; } public int getRemote_start() { return remote_start; } public void setRemote_start(int remote_start) { this.remote_start = remote_start; } public int getFault_reset() { return fault_reset; } public void setFault_reset(int fault_reset) { this.fault_reset = fault_reset; } public int getConscurrswitch() { return conscurrswitch; } public void setConscurrswitch(int conscurrswitch) { this.conscurrswitch = conscurrswitch; } public int getConstantvol() { return constantvol; } public void setConstantvol(int constantvol) { this.constantvol = constantvol; } public int getVolset_confirm() { return volset_confirm; } public void setVolset_confirm(int volset_confirm) { this.volset_confirm = volset_confirm; } public int getCurrset_confirm() { return currset_confirm; } public void setCurrset_confirm(int currset_confirm) { this.currset_confirm = currset_confirm; } public int getRemote_stop() { return remote_stop; } public void setRemote_stop(int remote_stop) { this.remote_stop = remote_stop; } public int getStart_screen_set() { return start_screen_set; } public void setStart_screen_set(int start_screen_set) { this.start_screen_set = start_screen_set; } public int getStart_upper_set() { return start_upper_set; } public void setStart_upper_set(int start_upper_set) { this.start_upper_set = start_upper_set; } public int getConsvolswitch() { return consvolswitch; } public void setConsvolswitch(int consvolswitch) { this.consvolswitch = consvolswitch; } public int getOthermode() { return othermode; } public void setOthermode(int othermode) { this.othermode = othermode; } public int getConsvol_distribution() { return consvol_distribution; } public void setConsvol_distribution(int consvol_distribution) { this.consvol_distribution = consvol_distribution; } public float getConsvolmode_chargecurr() { return consvolmode_chargecurr; } public void setConsvolmode_chargecurr(float consvolmode_chargecurr) { this.consvolmode_chargecurr = consvolmode_chargecurr; } public float getChargecurr_five() { return chargecurr_five; } public void setChargecurr_five(float chargecurr_five) { this.chargecurr_five = chargecurr_five; } public float getChargecurr_four() { return chargecurr_four; } public void setChargecurr_four(float chargecurr_four) { this.chargecurr_four = chargecurr_four; } public float getChargecurr_three() { return chargecurr_three; } public void setChargecurr_three(float chargecurr_three) { this.chargecurr_three = chargecurr_three; } public float getChargecurr_two() { return chargecurr_two; } public void setChargecurr_two(float chargecurr_two) { this.chargecurr_two = chargecurr_two; } public float getChargecurr_one() { return chargecurr_one; } public void setChargecurr_one(float chargecurr_one) { this.chargecurr_one = chargecurr_one; } public float getChargecurr_two() { return chargecurr_two; } public void setChargecurr_two(float chargecurr_two) { this.chargecurr_two = chargecurr_two; } public float getChargecurr_three() { return chargecurr_three; } public void setChargecurr_three(float chargecurr_three) { this.chargecurr_three = chargecurr_three; } public float getChargecurr_four() { return chargecurr_four; } public void setChargecurr_four(float chargecurr_four) { this.chargecurr_four = chargecurr_four; } public float getChargecurr_five() { return chargecurr_five; } public void setChargecurr_five(float chargecurr_five) { this.chargecurr_five = chargecurr_five; } public float getCurrset() { return currset; } public void setCurrset(float currset) { this.currset = currset; } public float getLocalgivecurr() { return localgivecurr; } public void setLocalgivecurr(float localgivecurr) { this.localgivecurr = localgivecurr; } public float getVolset() { return volset; } public void setVolset(float volset) { this.volset = volset; } public float getLocalgivevol() { return localgivevol; } public void setLocalgivevol(float localgivevol) { this.localgivevol = localgivevol; } public float getControlangle() { return controlangle; } public void setControlangle(float controlangle) { this.controlangle = controlangle; } public float getStopchargevol_five() { return stopchargevol_five; } public void setStopchargevol_five(float stopchargevol_five) { this.stopchargevol_five = stopchargevol_five; } public float getStopchargevol_four() { return stopchargevol_four; } public void setStopchargevol_four(float stopchargevol_four) { this.stopchargevol_four = stopchargevol_four; } public float getStopchargevol_three() { return stopchargevol_three; } public void setStopchargevol_three(float stopchargevol_three) { this.stopchargevol_three = stopchargevol_three; } public float getStopchargevol_two() { return stopchargevol_two; } public void setStopchargevol_two(float stopchargevol_two) { this.stopchargevol_two = stopchargevol_two; } public float getStopchargevol_one() { return stopchargevol_one; } public void setStopchargevol_one(float stopchargevol_one) { this.stopchargevol_one = stopchargevol_one; } public float getAlldccurr() { return alldccurr; public float getStopchargevol_two() { return stopchargevol_two; } public void setAlldccurr(float alldccurr) { this.alldccurr = alldccurr; public void setStopchargevol_two(float stopchargevol_two) { this.stopchargevol_two = stopchargevol_two; } public float getAlldcvol() { return alldcvol; public float getStopchargevol_three() { return stopchargevol_three; } public void setAlldcvol(float alldcvol) { this.alldcvol = alldcvol; public void setStopchargevol_three(float stopchargevol_three) { this.stopchargevol_three = stopchargevol_three; } public float getBrachdccurr() { return brachdccurr; public float getStopchargevol_four() { return stopchargevol_four; } public void setBrachdccurr(float brachdccurr) { this.brachdccurr = brachdccurr; public void setStopchargevol_four(float stopchargevol_four) { this.stopchargevol_four = stopchargevol_four; } public float getBrachdcvol() { return brachdcvol; public float getStopchargevol_five() { return stopchargevol_five; } public void setBrachdcvol(float brachdcvol) { this.brachdcvol = brachdcvol; public void setStopchargevol_five(float stopchargevol_five) { this.stopchargevol_five = stopchargevol_five; } public String getElectric2KW_ip() { return electric2KW_ip; } public void setElectric2KW_ip(String electric2kw_ip) { electric2KW_ip = electric2kw_ip; } @Override public String toString() { return "Electric_Control_Single_2kw [num=" + num + ", electric2KW_id=" + electric2KW_id + ", consvolmode_chargecurr=" + consvolmode_chargecurr + ", chargecurr_five=" + chargecurr_five + ", chargecurr_four=" + chargecurr_four + ", chargecurr_three=" + chargecurr_three + ", chargecurr_two=" + chargecurr_two + ", chargecurr_one=" + chargecurr_one + ", currset=" + currset + ", localgivecurr=" + localgivecurr + ", volset=" + volset + ", localgivevol=" + localgivevol + ", controlangle=" + controlangle + ", stopchargevol_five=" + stopchargevol_five + ", stopchargevol_four=" + stopchargevol_four + ", stopchargevol_three=" + stopchargevol_three + electric2KW_id + ", upper_pulse_block=" + upper_pulse_block + ", remote_start=" + remote_start + ", fault_reset=" + fault_reset + ", conscurrswitch=" + conscurrswitch + ", constantvol=" + constantvol + ", volset_confirm=" + volset_confirm + ", currset_confirm=" + currset_confirm + ", remote_stop=" + remote_stop + ", start_screen_set=" + start_screen_set + ", start_upper_set=" + start_upper_set + ", consvolswitch=" + consvolswitch + ", othermode=" + othermode + ", consvol_distribution=" + consvol_distribution + ", consvolmode_chargecurr=" + consvolmode_chargecurr + ", chargecurr_one=" + chargecurr_one + ", chargecurr_two=" + chargecurr_two + ", chargecurr_three=" + chargecurr_three + ", chargecurr_four=" + chargecurr_four + ", chargecurr_five=" + chargecurr_five + ", currset=" + currset + ", volset=" + volset + ", stopchargevol_one=" + stopchargevol_one + ", stopchargevol_two=" + stopchargevol_two + ", stopchargevol_one=" + stopchargevol_one + ", alldccurr=" + alldccurr + ", alldcvol=" + alldcvol + ", brachdccurr=" + brachdccurr + ", brachdcvol=" + brachdcvol + ", electric2KW_ip=" + electric2KW_ip + "]"; + ", stopchargevol_three=" + stopchargevol_three + ", stopchargevol_four=" + stopchargevol_four + ", stopchargevol_five=" + stopchargevol_five + "]"; }
@@ -22,6 +22,7 @@ public int othermode ;//'4并或2串2并以外模式', public int consvol_distribution ;//'四串恒压电压分配位', public int local_remote_control ;//'就地远程控制状态', public int pulse_blocking;// '脉冲封锁', public int curve_charge_mode ;//'曲线充电模式状态', public int start_curve_charge_mode ;//'启动曲线充电模式', public int stop_curve_charge_mode ;//'停止曲线充电模式', @@ -164,6 +165,12 @@ public void setNote(int note) { this.note = note; } public int getPulse_blocking() { return pulse_blocking; } public void setPulse_blocking(int pulse_blocking) { this.pulse_blocking = pulse_blocking; } @Override public String toString() { return "Electric_Rt_2kw [num=" + num + ", electric2KW_id=" @@ -180,10 +187,10 @@ + ", consvolswitch=" + consvolswitch + ", othermode=" + othermode + ", consvol_distribution=" + consvol_distribution + ", local_remote_control=" + local_remote_control + ", curve_charge_mode=" + curve_charge_mode + ", start_curve_charge_mode=" + start_curve_charge_mode + ", stop_curve_charge_mode=" + stop_curve_charge_mode + ", note=" + note + "]"; + ", pulse_blocking=" + pulse_blocking + ", curve_charge_mode=" + curve_charge_mode + ", start_curve_charge_mode=" + start_curve_charge_mode + ", stop_curve_charge_mode=" + stop_curve_charge_mode + ", note=" + note + "]"; }
@@ -28,6 +28,7 @@ @Override public boolean update(Object obj) { Electric_control_conn econn=(Electric_control_conn) obj; //System.out.println(econn); String updateSql=""; float updateVaule=0f; switch (econn.getNum()) { @@ -56,6 +57,7 @@ //组合控制界面<电压/电流确认> public boolean delVCSet(Object obj) { Electric_control_conn econn=(Electric_control_conn) obj; //System.out.println(econn); String updateSql=""; float updateVaule=0f; switch (econn.getNum()) { DyEnvir_system/src/com/fgkj/electricsystem/Service/Electric_control_connService.java
@@ -39,7 +39,7 @@ //电源系统组合控制<socket> public ServiceModel updatePLC(Object obj) { Electric_control_conn econn=(Electric_control_conn) obj; //System.out.println(econn); System.out.println(econn); boolean bl=false; BaseData basedata=null; byte[] b=null; @@ -171,25 +171,30 @@ } break;// '电流给定', case 7: basedata = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_1"),1); b=basedata.createSingleCollWiriteData(basedata.createButtonByte(1)); bl=SocketClient.SocketComm(b, econn.getElectric_ip()); case 7: BaseData basedata71 = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_1"),1); byte[] b71=basedata71.createSingleCollWiriteData(basedata71.createButtonByte(1)); boolean bl71=SocketClient.SocketComm(b71, econn.getElectric_ip()); System.out.println("1=="+bl71); basedata = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_2"),1); b=basedata.createSingleCollWiriteData(basedata.createButtonByte(1)); bl=SocketClient.SocketComm(b, econn.getElectric_ip()); Thread.sleep(100); BaseData basedata72 = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_2"),1); byte[] b72=basedata72.createSingleCollWiriteData(basedata72.createButtonByte(1)); boolean bl72=SocketClient.SocketComm(b72, econn.getElectric_ip()); System.out.println("2=="+bl72); try { //100毫秒后复原 Thread.sleep(100); basedata = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_1"),1); b=basedata.createSingleCollWiriteData(basedata.createButtonByte(0)); bl=SocketClient.SocketComm(b, econn.getElectric_ip()); BaseData basedata73 = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_1"),1); byte[] b73=basedata73.createSingleCollWiriteData(basedata73.createButtonByte(0)); boolean bl73=SocketClient.SocketComm(b73, econn.getElectric_ip()); System.out.println("3=="+bl73); basedata = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_2"),1); b=basedata.createSingleCollWiriteData(basedata.createButtonByte(0)); bl=SocketClient.SocketComm(b, econn.getElectric_ip()); Thread.sleep(100); BaseData basedata74 = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id(), "switchon_2"),1); byte[] b74=basedata74.createSingleCollWiriteData(basedata74.createButtonByte(0)); boolean bl74=SocketClient.SocketComm(b74, econn.getElectric_ip()); System.out.println("4=="+bl74); bl=bl73; } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -204,7 +209,7 @@ bl=SocketClient.SocketComm(b, econn.getElectric_ip()); try { //100毫秒后复原 Thread.sleep(100); Thread.sleep(500); basedata = new BaseData(Modbus_ComBase.WRITE_SINGLE_COIL,Electric_4KW_ModbusAddress.getAddress(econn.getElectric_id()+1, "switchon_1"),1); b=basedata.createSingleCollWiriteData(basedata.createButtonByte(0)); bl=SocketClient.SocketComm(b, econn.getElectric_ip()); DyEnvir_system/src/com/modbus/data/BaseData.java
@@ -94,7 +94,7 @@ bf.flip(); byte[] databyte = new byte[bf.limit()]; bf.get(databyte); //System.out.println(ComFn.bytesToHexString(databyte, databyte.length)); System.out.println(ComFn.bytesToHexString(databyte, databyte.length)); return databyte; }
@@ -33,8 +33,7 @@ // --------------------- socket write // -----------------------------------// // byte[] b = makeCommBuf(cmd, bf); // System.err.println("发送数据："+ComFn.bytesToHexString(bytedata, // bytedata.length)); //System.err.println("发送数据："+ComFn.bytesToHexString(bytedata,bytedata.length)); Date d1 = new Date(); int rx_read_time_out = 0; // int rx_len = 0;
