From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattTestData.java | 129 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 121 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 3723b1c..fbafbec 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -1,7 +1,16 @@
package com.fgkj.dao;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
public class BattTestData {
-final public static int BATT_MON_COUNT_MAX = 512;
+ final public static int BATT_DISCHARGE=3;//鏀剧數娴嬭瘯
+ final public static int BATT_RES=5;//鍐呴樆娴嬭瘯
+
+ final public static int AppServer_Reinit_BattGroupData_EN=1;//淇敼鍒犻櫎娣诲姞鐢垫睜缁勪俊鎭椂璇嗗埆淇″彿
+
+ final public static int BATT_MON_COUNT_MAX = 512;
final public static byte BATTDATA_NULL = 0;
final public static byte BATTDATA_FLOAT = 1;
@@ -66,6 +75,78 @@
//钀藉悗鍗曚綋鍙傛暟锛堢粍绔數鍘�>鏍囩О*test_stop锛�
public static final float test_stop = 0.9f;
+
+ //鍚姩鍒涘缓鏁版嵁搴撶殑jar鏂囦欢
+ public static void run_cmdOld() {
+ String path=System.getProperty("user.dir");
+ String realapth=path.substring(0,path.lastIndexOf("\\"));
+ //System.out.println(realapth);
+ String strcmd="cmd /c start "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
+ //
+ Runtime rt = Runtime.getRuntime(); //Runtime.getRuntime()杩斿洖褰撳墠搴旂敤绋嬪簭鐨凴untime瀵硅薄
+ Process ps = null; //Process鍙互鎺у埗璇ュ瓙杩涚▼鐨勬墽琛屾垨鑾峰彇璇ュ瓙杩涚▼鐨勪俊鎭��
+ try {
+ ps = rt.exec(strcmd); //璇ュ璞＄殑exec()鏂规硶鎸囩ずJava铏氭嫙鏈哄垱寤轰竴涓瓙杩涚▼鎵ц鎸囧畾鐨勫彲鎵ц绋嬪簭锛屽苟杩斿洖涓庤瀛愯繘绋嬪搴旂殑Process瀵硅薄瀹炰緥銆�
+ ps.waitFor(); //绛夊緟瀛愯繘绋嬪畬鎴愬啀寰�涓嬫墽琛屻��
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ int i = ps.exitValue(); //鎺ユ敹鎵ц瀹屾瘯鐨勮繑鍥炲��
+ if (i == 0) {
+ System.out.println("鎵ц瀹屾垚.");
+ } else {
+ System.out.println("鎵ц澶辫触.");
+ }
+
+ ps.destroy(); //閿�姣佸瓙杩涚▼
+ ps = null;
+ }
+
+ //鍚姩鍒涘缓鏁版嵁搴撶殑jar鏂囦欢
+ public static void run_cmd() {
+ String path=System.getProperty("user.dir"); //myeclipse涓幏鍙栫殑鐩綍(鑾峰彇鍒扮殑鏄痶omcat/bin)鍜屽垎绂婚」鐩幏鍙栧埌鐨勮矾寰�(tomcat)涓嶄竴鏍�
+ //System.out.println(path);
+ String realapth=path.substring(0,path.lastIndexOf("\\"));
+ String strcmd="cmd /c start "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
+ String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
+ File f = new File(path);
+ //System.out.println("File :"+f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd");
+ //batPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd";
+ String jarPath = "";
+ if(path.endsWith("bin")){
+ f = f.getParentFile();
+ }
+
+ jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.exe"; //涓荤▼搴忎腑exe鐨勭洰褰�
+ //strcmd = "cmd /c start "+batPath;
+ strcmd = ("cmd /c start ")+jarPath.replaceAll(" ", "\" \""); //淇缁濆璺緞涓瓨鍦ㄧ┖鏍兼椂鎵ц涓嶆垚鍔焍ug
+ System.out.println(strcmd);
+ Process child = null;
+ InputStream in = null;
+ try {
+ //System.out.println(strcmd);
+ child = Runtime.getRuntime().exec(strcmd);
+ in = child.getInputStream();
+ int c;
+ while ((c = in.read()) != -1) {
+ //System.out.print((char)c);
+ }
+ in.close();
+ try {
+ child.waitFor();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ //System.out.println("Run Bat OK....");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
//鍒ゆ柇鐢垫睜缁勭殑褰撳墠鐘舵��
public static String battState(int num){
String state="";
@@ -180,13 +261,45 @@
return stop_type;
}
//璁惧鐘舵�佸彉鎹㈠搴斿叧绯�
- public static String getFbsdev_Statechange(int state){
- String state_name="鍋滄";
- switch(state){
- case 0:state_name="鍋滄";break;
- case 1:state_name="鏀剧數";break;
- case 2:state_name="鍏呯數";break;
- }
+ public static String getFbsdev_Statechange(int eve_type,int state){
+ String state_name="鏈煡";
+ if(eve_type==0){
+ if(state==0){
+ state_name="鍦ㄧ嚎鐩戞祴";
+ }else if(state==1){
+ state_name="鏀剧數娴嬭瘯";
+ }else if(state==2){
+ state_name="鍏呯數娴嬭瘯";
+ }else if(state==3){
+ state_name="鍗囧帇缁埅";
+ }
+ }else if(eve_type==11){
+ if(state==0){
+ state_name="姝ｅ父";
+ }else if(state==1){
+ state_name="鏁呴殰";
+ }
+ }else if(eve_type==12){
+ if(state==0){
+ state_name="鍦ㄧ嚎";
+ }else if(state==1){
+ state_name="绂荤嚎";
+ }
+ }else if(eve_type==20){
+ state_name="0x"+Integer.toHexString(state);
+ }
return state_name;
}
+
+ //璁惧鐘舵�佸彉鎹㈠搴攅ve_type
+ public static String getEve_type_name(int eve_type){
+ String eve_type_name="鏈煡";
+ switch(eve_type){
+ case 0:eve_type_name="BTS宸ヤ綔鐘舵��";break;
+ case 11:eve_type_name="SD鍗℃晠闅�";break;
+ case 12:eve_type_name="鐢垫睜绂荤嚎鐘舵��";break;
+ case 20:eve_type_name="DCDC妯″潡鍛婅鐘舵��";break;
+ }
+ return eve_type_name;
+ }
}
--
Gitblit v1.9.1