From a220fe323e37523f76996b0eb91ca55f1f7af5ce Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 12 十月 2018 14:04:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BaseDAO.java | 2
gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java | 32 ++++++
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 98 ++++++++++++++++++-
gx_tieta/src/com/fgkj/dto/BattInf.java | 9 +
gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java | 38 +++++++
gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java | 101 +++++++++++++++++--
gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java | 2
7 files changed, 262 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
new file mode 100644
index 0000000..3f890b4
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
@@ -0,0 +1,38 @@
+package com.fgkj.actions.ram;
+
+import com.fgkj.actions.ActionUtil;
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.services.ram.Bts_station_stateService;
+
+public class Bts_station_stateAction extends ActionUtil{
+ private Bts_station_stateService service=new Bts_station_stateService();
+ private String json;
+ private String result;
+ //鏌ヨ鏈烘埧瀹炴椂鐘舵��
+ private String serchByCondition(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model=service.serchByCondition(binf);
+ result=tojson(model);
+ return SUCCESS;
+ }
+
+
+
+
+
+
+
+
+
+ public String getResult() {
+ return result;
+ }
+ public void setJson(String json) {
+ this.json = json;
+ }
+
+
+
+
+}
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAO.java b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
index c929e3d..b867be1 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAO.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
@@ -180,6 +180,8 @@
public static final int BATTINF_REBUILD=88;
+ public static final int BTS_STATION_STATE=89;
+
public boolean add(Object obj); // 娣诲姞
public boolean update(Object obj); // 鏇存柊
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index e5d19c0..0d6149c 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -76,6 +76,7 @@
import com.fgkj.dao.impl.Ld9.Ld9testdatastopImpl;
import com.fgkj.dao.impl.bts61850.BTS_61850_setparamImpl;
import com.fgkj.dao.impl.bts61850.BTS_61850_stateImpl;
+import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl;
import com.fgkj.dao.impl.ram.Fbs9100_stateImpl;
import com.fgkj.dao.impl.ram.Fbs9100s_dcdc_stateImpl;
@@ -186,6 +187,7 @@
case 86:return new Batt_devalarm_data_historyImpl();
case 87:return new Batt_enduranceImpl();
case 88:return new BattInf_RebuildImpl();
+ case 89:return new Bts_station_stateImpl();
default :return null;
}
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index c0dd585..0d191aa 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -1,10 +1,18 @@
package com.fgkj.dao.impl.ram;
+import java.sql.Connection;
import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.dao.LimitNumberFactory;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Page;
import com.fgkj.dto.ram.Bts_station_state;
public class Bts_station_stateImpl implements BaseDAO,CallBack{
@@ -35,12 +43,73 @@
}
//鏌ヨ鏈烘埧瀹炴椂鐘舵��
public List serchByCondition(Object obj) {
- Bts_station_state bs=(Bts_station_state) obj;
- String sql="select distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_poff_tlong,station_fadian_start_time,station_fadian_tlong" +
- " ,station_diaozhan_start_time,station_diaozhan_tlong,station_temp,station_damp,station_dooropen_start_time,station_dooropen_tlong " +
- " from db_ram_db.tb_bts_station_station_state " +
- " where ";
- return null;
+ BattInf binf=(BattInf) obj;
+ Page p=new Page();
+ Connection conn=DBUtil.getConn();
+ String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
+ String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_poff_tlong,station_fadian_start_time,station_fadian_tlong" +
+ " ,station_diaozhan_start_time,station_diaozhan_tlong,station_temp,station_damp,station_dooropen_start_time,station_dooropen_tlong" +
+ " ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3 " +
+ " from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf " +
+ " where tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
+ " and tb_bts_station_state.station_id=db_battinf.tb_battinf.StationId " +
+ " and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ? " +
+ " and stationid like ? limit ? ,? ";
+ List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Bts_station_state b=new Bts_station_state();
+ b.setStation_id(rs.getString("station_id"));
+ b.setDev_id(rs.getInt("dev_id"));
+ b.setRecord_datetime(rs.getTimestamp("record_datetime"));
+ b.setStation_stat(rs.getInt("station_stat"));
+ if(((b.getStation_stat()>>3)&1)==1){
+ b.setStation_stat_dooropen(1);//寮�闂�
+ }
+ if(((b.getStation_stat()>>2)&1)==1){
+ b.setStation_stat_diaozhan(1);//鎺夌珯
+ }
+ if(((b.getStation_stat()>>1)&1)==1){
+ b.setStation_stat_fadian(1); //鍙戠數
+ }
+ if((b.getStation_stat()&1)==1){
+ b.setStation_stat_poff(1); //鍋滅數
+ }
+ b.setStation_poff_start_time(rs.getTimestamp("station_poff_start_time"));
+ b.setStation_poff_tlong(rs.getInt("station_poff_tlong"));
+ b.setStation_fadian_start_time(rs.getTimestamp("station_fadian_start_time"));
+ b.setStation_fadian_tlong(rs.getInt("station_fadian_tlong"));
+ b.setStation_diaozhan_start_time(rs.getTimestamp("station_diaozhan_start_time"));
+ b.setStation_diaozhan_tlong(rs.getInt("station_diaozhan_tlong"));
+ b.setStation_temp(rs.getFloat("station_temp"));
+ b.setStation_damp(rs.getFloat("station_damp"));
+ b.setStation_dooropen_start_time(rs.getTimestamp("station_dooropen_start_time"));
+ b.setStation_dooropen_tlong(rs.getInt("station_dooropen_tlong"));
+ b.setStationName(rs.getString("stationName"));
+ b.setStationName1(rs.getString("stationName1"));
+ b.setStationName2(rs.getString("stationName2"));
+ b.setStationName3(rs.getString("stationName3"));
+ Page page=new Page();
+ b.setPage(page);
+ list.add(b);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ //鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
+ int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
+ //System.out.println("number: "+number);
+ if(list!=null&&list.size()>0){
+ list.get(list.size()-1).getPage().setPageAll(number);
+ }
+ return list;
}
public List serchByInfo(Object obj) {
@@ -48,4 +117,21 @@
return null;
}
+ public static void main(String[] args) {
+ Bts_station_stateImpl bimpl=new Bts_station_stateImpl();
+ BattInf binf=new BattInf();
+ binf.setStationName1("");
+ binf.setStationName2("");
+ binf.setStationName3("");
+ binf.setStationId("");
+ Page p=new Page();
+ p.setPageCurr(1);
+ p.setPageSize(10);
+ binf.setPage(p);
+ List<Bts_station_state> list=bimpl.serchByCondition(binf);
+ for (Bts_station_state bs : list) {
+ //System.out.println(bs.getStation_stat_dooropen()+" "+bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_poff());
+ System.out.println(bs);
+ }
+ }
}
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 5c8b7fb..b407550 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -73,7 +73,7 @@
private String SignalName;
private Integer StartNum;
private Integer Size;
-
+ private Page page;
private Object obj;
public BattInf() {
super();
@@ -496,6 +496,13 @@
public void setObj(Object obj) {
this.obj = obj;
}
+
+ public Page getPage() {
+ return page;
+ }
+ public void setPage(Page page) {
+ this.page = page;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
index 9bb6325..da4763d 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -7,32 +7,54 @@
public class Bts_station_state implements Serializable{
private int num;
- private int station_id;
+ private String station_id;
private int dev_id;
private Date record_datetime;
private int station_stat;
+
+ private int station_stat_poff;
private Date station_poff_start_time;
private int station_poff_tlong;
+
+ private int station_stat_fadian;
private Date station_fadian_start_time;
private int station_fadian_tlong;
+
+ private int station_stat_diaozhan;
private Date station_diaozhan_start_time;
private int station_diaozhan_tlong;
private float station_temp;
private float station_damp;
+
+ private int station_stat_dooropen;
private Date station_dooropen_start_time;
private int station_dooropen_tlong;
private String note;
+ private String stationName;
+ private String stationName1;
+ private String stationName2;
+ private String stationName3;
private Page page;
+
+
+ /*public Bts_station_state() {
+ super();
+ station_stat_poff=0;
+ station_stat_fadian=0;
+ station_stat_diaozhan=0;
+ station_stat_dooropen=0;
+ }*/
public int getNum() {
return num;
}
public void setNum(int num) {
this.num = num;
}
- public int getStation_id() {
+
+ public String getStation_id() {
return station_id;
}
- public void setStation_id(int station_id) {
+ public void setStation_id(String station_id) {
this.station_id = station_id;
}
public int getDev_id() {
@@ -125,24 +147,77 @@
public void setPage(Page page) {
this.page = page;
}
+ public String getStationName() {
+ return stationName;
+ }
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+ public String getStationName1() {
+ return stationName1;
+ }
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+ public String getStationName2() {
+ return stationName2;
+ }
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
+ public String getStationName3() {
+ return stationName3;
+ }
+ public void setStationName3(String stationName3) {
+ this.stationName3 = stationName3;
+ }
+ public int getStation_stat_poff() {
+ return station_stat_poff;
+ }
+ public void setStation_stat_poff(int station_stat_poff) {
+ this.station_stat_poff = station_stat_poff;
+ }
+ public int getStation_stat_fadian() {
+ return station_stat_fadian;
+ }
+ public void setStation_stat_fadian(int station_stat_fadian) {
+ this.station_stat_fadian = station_stat_fadian;
+ }
+ public int getStation_stat_diaozhan() {
+ return station_stat_diaozhan;
+ }
+ public void setStation_stat_diaozhan(int station_stat_diaozhan) {
+ this.station_stat_diaozhan = station_stat_diaozhan;
+ }
+ public int getStation_stat_dooropen() {
+ return station_stat_dooropen;
+ }
+ public void setStation_stat_dooropen(int station_stat_dooropen) {
+ this.station_stat_dooropen = station_stat_dooropen;
+ }
@Override
public String toString() {
return "Bts_station_state [num=" + num + ", station_id=" + station_id
+ ", dev_id=" + dev_id + ", record_datetime=" + record_datetime
- + ", station_stat=" + station_stat
- + ", station_poff_start_time=" + station_poff_start_time
- + ", station_poff_tlong=" + station_poff_tlong
- + ", station_fadian_start_time=" + station_fadian_start_time
- + ", station_fadian_tlong=" + station_fadian_tlong
- + ", station_diaozhan_start_time="
+ + ", station_stat=" + station_stat + ", station_stat_poff="
+ + station_stat_poff + ", station_poff_start_time="
+ + station_poff_start_time + ", station_poff_tlong="
+ + station_poff_tlong + ", station_stat_fadian="
+ + station_stat_fadian + ", station_fadian_start_time="
+ + station_fadian_start_time + ", station_fadian_tlong="
+ + station_fadian_tlong + ", station_stat_diaozhan="
+ + station_stat_diaozhan + ", station_diaozhan_start_time="
+ station_diaozhan_start_time + ", station_diaozhan_tlong="
+ station_diaozhan_tlong + ", station_temp=" + station_temp
- + ", station_damp=" + station_damp
- + ", station_dooropen_start_time="
+ + ", station_damp=" + station_damp + ", station_stat_dooropen="
+ + station_stat_dooropen + ", station_dooropen_start_time="
+ station_dooropen_start_time + ", station_dooropen_tlong="
- + station_dooropen_tlong + ", note=" + note + ", page=" + page
- + "]";
+ + station_dooropen_tlong + ", note=" + note + ", stationName="
+ + stationName + ", stationName1=" + stationName1
+ + ", stationName2=" + stationName2 + ", stationName3="
+ + stationName3 + ", page=" + page + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
new file mode 100644
index 0000000..31ed580
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
@@ -0,0 +1,32 @@
+package com.fgkj.services.ram;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dto.ServiceModel;
+
+public class Bts_station_stateService {
+ private ServiceModel model;
+ private BaseDAO dao;
+
+ public Bts_station_stateService() {
+ super();
+ model=new ServiceModel();
+ dao=BaseDAOFactory.getBaseDAO(BaseDAO.BTS_STATION_STATE);
+ }
+ //鏌ヨ鏈烘埧瀹炴椂鐘舵��
+ public ServiceModel serchByCondition(Object obj) {
+ List list=dao.serchByCondition(obj);
+ if(list!=null&&list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+
+}
--
Gitblit v1.9.1