From 108e84259b6fc890af880e76f7a9e3cb19b8dc4e Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 11:50:16 +0800
Subject: [PATCH] 设备状态变迁修改
---
gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java | 16 +++++++-
gx_tieta/src/com/fgkj/dao/BattTestData.java | 46 +++++++++++++++++++---
gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java | 5 +-
3 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 15c5437..61869a4 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -261,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=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;
+ }
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
index f2c3ea2..bf8a5b3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
@@ -83,13 +83,14 @@
state_inf.setDev_id(rs.getInt("dev_id"));
state_inf.setRec_time(rs.getTimestamp("rec_time"));
state_inf.setLast_stat(rs.getInt("last_stat"));
- state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("last_stat")));
+ state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("last_stat")));
state_inf.setNow_stat(rs.getInt("now_stat"));
- state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("now_stat")));
+ state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("now_stat")));
state_inf.setState_change_reason(rs.getInt("state_change_reason"));
state_inf.setState_change_reason_name(BattTestData.getStopType(BattTestData.TEST_LOADER_FBS9100S, rs.getInt("state_change_reason")));
state_inf.setDev_alarm(rs.getInt("dev_alarm"));
state_inf.setEve_type(rs.getInt("eve_type"));
+ state_inf.setEve_type_name(BattTestData.getEve_type_name(rs.getInt("eve_type")));
state_inf.setModule_num(rs.getInt("module_num"));
state_inf.setNote(rs.getString("stationName"));
list.add(state_inf);
diff --git a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
index de25425..550671e 100644
--- a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
+++ b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
@@ -17,6 +17,7 @@
private Integer dev_alarm;
private String dev_alarm_name;
private int eve_type;
+ private String eve_type_name;
private int module_num;
private String note;
private Page page;
@@ -153,6 +154,14 @@
public void setModule_num(int module_num) {
this.module_num = module_num;
}
+
+ public String getEve_type_name() {
+ return eve_type_name;
+ }
+
+ public void setEve_type_name(String eve_type_name) {
+ this.eve_type_name = eve_type_name;
+ }
@Override
public String toString() {
@@ -164,11 +173,14 @@
+ state_change_reason + ", state_change_reason_name="
+ state_change_reason_name + ", dev_alarm=" + dev_alarm
+ ", dev_alarm_name=" + dev_alarm_name + ", eve_type="
- + eve_type + ", module_num=" + module_num + ", note=" + note
- + ", page=" + page + "]";
+ + eve_type + ", eve_type_name=" + eve_type_name
+ + ", module_num=" + module_num + ", note=" + note + ", page="
+ + page + "]";
}
+
+
}
--
Gitblit v1.9.1