From 18cf7a6b456cb0f401c48ad16b12de1877541558 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期一, 22 十月 2018 09:50:34 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java | 29 +++-
gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java | 5
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 23 ++-
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 99 ++++++++++++++++
gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java | 3
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 65 ++++++++++
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 16 ++
gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java | 7 +
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 4
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 53 ++++++++
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 12 +
gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java | 10 +
gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java | 24 +++
13 files changed, 319 insertions(+), 31 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index af20d32..512861a 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -329,6 +329,8 @@
//鐢垫睜閰嶇粍绠＄悊(閲嶈)
public String serchMakeGroup(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model = service.serchMakeGroup(binf);
result = ActionUtil.tojson(model);
return SUCCESS;
@@ -336,6 +338,8 @@
//鐢垫睜閰嶇粍绠＄悊(閲嶈)
public String serchGroupByInfor(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model = service.serchGroupByInfor(binf);
result = ActionUtil.tojson(model);
return SUCCESS;
diff --git a/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java b/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java
index d6a8f2d..7ea5587 100644
--- a/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java
@@ -4,6 +4,7 @@
import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.dto.BattMap_information;
+import com.fgkj.dto.Page;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.User_log;
@@ -98,14 +99,31 @@
result = tojson(model);
return SUCCESS;
}
- //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�) 鍖呮嫭(鍛婅鎬绘暟钀藉悗鎬绘暟寤惰繜鎬绘暟)
+ //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
public String searchUserManageStation() {
User_inf uinf=(User_inf) getUser();
- List list = service.searchUserManageStation(uinf);
+ ServiceModel model = service.searchUserManageStation(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨勶紝鍒嗛〉鍒锋柊)
+ public String searchUserManageStation2() {
+ Page p=getGson().fromJson(json, Page.class);
+ User_inf uinf=(User_inf) getUser();
+ p.setPageAll(uinf.getUId());
+ List list = service.searchUserManageStation2(p);
result = tojson(list);
return SUCCESS;
}
-
+ //9.1棣栭〉涓婃煡璇㈠凡缁忔坊鍔犵墿鐞嗕俊鎭殑鏈烘埧(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
+ public String searchUserManageStation3() {
+ BattMap_information binfor=getGson().fromJson(json, BattMap_information.class);
+ User_inf uinf=(User_inf) getUser();
+ binfor.setNum(uinf.getUId());
+ List list = service.searchUserManageStation3(binfor);
+ result = tojson(list);
+ return SUCCESS;
+ }
//9.1鐢垫睜瀵垮懡绠＄悊
public String serchByStationid(){
BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
index 2ac9952..32b90d3 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
@@ -2,6 +2,7 @@
import com.fgkj.dto.Batt_endurance;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
import com.fgkj.services.Batt_enduranceService;
public class Batt_enduranceAction extends ActionUtil{
@@ -12,6 +13,8 @@
//缁埅鏃堕棿鐨勬煡璇�
public String serchByCondition() {
Batt_endurance bendurance=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_endurance.class);
+ User_inf uinf=(User_inf) getUser();
+ bendurance.setNum(uinf.getUId());
ServiceModel model=service.serchByCondition(bendurance);
result=tojson(model);
return SUCCESS;
diff --git a/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java b/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java
index b65ea75..cc71771 100644
--- a/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java
@@ -5,6 +5,7 @@
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Bts_station_event;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
import com.fgkj.services.Batt_devalarm_data_historyService;
import com.fgkj.services.Bts_station_eventService;
@@ -17,6 +18,8 @@
//鏈烘埧浜嬩欢缁熻
public String serchByCondition(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model=service.serchByCondition(binf);
result=tojson(model);
return SUCCESS;
@@ -24,6 +27,8 @@
//鏈烘埧浜嬩欢缁熻
public String serchByInfo(){
Bts_station_event bevent=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Bts_station_event.class);
+ User_inf uinf=(User_inf) getUser();
+ bevent.setNum(uinf.getUId());
ServiceModel model=service.serchByInfo(bevent);
result=tojson(model);
return SUCCESS;
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
index d9b5ec5..a3acfa2 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
@@ -3,6 +3,7 @@
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
import com.fgkj.services.ram.Bts_station_stateService;
public class Bts_station_stateAction extends ActionUtil{
@@ -12,10 +13,19 @@
//鏌ヨ鏈烘埧瀹炴椂鐘舵��
public String serchByCondition(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model=service.serchByCondition(binf);
result=tojson(model);
return SUCCESS;
}
+ //鏌ヨ褰撳墠鏈烘埧鍋滅數鏁�
+ public String serchByState(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchByState(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 3767a63..b8f8349 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3628,7 +3628,12 @@
" from db_battinf.tb_battinf " +
" left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +
" on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +
- " where stationname2 like ? ";
+ " where stationname2 like ? ";
+ //鐢ㄦ埛绠＄悊
+ String userSql=" and StationId in(" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) ";
+ sql+=userSql;
//閫変腑鍝佺墝涓�鑷�
String producerSqlT=" order by BattProducer,MonCapStd,MonVolStd,BattGroupId ";//涓�鑷�
String producerSqlF=" order by MonCapStd,MonVolStd,BattGroupId ";//涓嶄竴鑷�
@@ -3637,7 +3642,7 @@
}else{
sql+=producerSqlF;
}
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName2()+"%"}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName2()+"%",binf.getNum()}, new CallBack() {
public List getResults(ResultSet rs) {
List<BattInf> list=new ArrayList();
@@ -3704,7 +3709,12 @@
" left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +
" on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +
" where stationname1 like ? and stationname2 like ? and stationname3 like ? and battgroupname like ? and battgroupid=? ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId()}, new CallBack() {
+ //鐢ㄦ埛绠＄悊
+ String userSql=" and StationId in(" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) ";
+ sql+=userSql;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId(),binf.getNum()}, new CallBack() {
public List getResults(ResultSet rs) {
List<BattInf> list=new ArrayList();
@@ -3769,11 +3779,12 @@
BattInfImpl biml = new BattInfImpl();
BattInf binf = new BattInf();
+ binf.setNum(1002);
binf.setBattGroupId(1000001);
binf.setStationName("");
binf.setStationName1("");
binf.setStationName2("");
- binf.setStationName3("姝︽眽婧愭殺瀹為獙瀹�1");
+ binf.setStationName3("");
binf.setBattGroupName("");
binf.setBattProducer("1");
User_inf uinf=new User_inf();
@@ -3800,8 +3811,8 @@
//List<BattInf> list = biml.serchByConditionNew(bmd);
//List<BattInf> list=biml.serchByTestType(bmd);
//List<BattInf> list=biml.serchGroupAssess(bmd);
- //List<BattInf> list=biml.serchMakeGroup(binf);
- List<BattInf> list=biml.serchGroupByInfor(binf);
+ List<BattInf> list=biml.serchMakeGroup(binf);
+ //List<BattInf> list=biml.serchGroupByInfor(binf);
for (BattInf b : list) {
System.out.println(b);
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
index 0a540cc..617f063 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -1,5 +1,6 @@
package com.fgkj.dao.impl;
+import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -9,6 +10,7 @@
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.db.IDatabaseName;
import com.fgkj.dto.BattDischarge_plan;
@@ -16,6 +18,7 @@
import com.fgkj.dto.BattMap_information;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Battalarm_data;
+import com.fgkj.dto.Page;
import com.fgkj.dto.User_inf;
public class BattMap_informationImpl implements BaseDAO,CallBack{
@@ -127,7 +130,7 @@
});
return list;
}
- //9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨�)
+ //9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
public List serchInBattMapByUid(Object obj) {
User_inf uinf=(User_inf) obj;
String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId " +
@@ -139,7 +142,7 @@
" left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
" left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? )";
+ " where db_user.tb_user_inf.uid=? ) ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -166,6 +169,98 @@
} );
return list;
}
+ //9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨勶紝鍒嗛〉鍒锋柊)
+ public List serchInBattMapByUid2(Object obj) {
+ Page page=(Page) obj;
+ int uid=page.getPageAll();
+ Connection conn=DBUtil.getConn();
+ String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
+ String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId " +
+ " from web_site.tb_battmap_information,db_battinf.tb_battinf " +
+ " where tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
+ " and tb_battmap_information.StationId in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " +
+ " limit ?,? " +
+ " order by tb_battmap_information.StationId ";
+ List<BattMap_information> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{uid,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ BattMap_information binformation=new BattMap_information();
+ binformation.setNum(rs.getInt("num"));
+ binformation.setStationId(rs.getString("stationId"));
+ binformation.setStationName(rs.getString("stationName"));
+ binformation.setAddress(rs.getString("address"));
+ binformation.setLongitude(rs.getDouble("longitude"));
+ binformation.setLatitude(rs.getDouble("latitude"));
+ binformation.setInformation(rs.getString("information"));
+ binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+ Page p=new Page();
+ binformation.setPage(p);
+ list.add(binformation);
+ }
+ } 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;
+ }
+ //9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
+ public List serchInBattMapByUid3(Object obj) {
+ BattMap_information binfor=(BattMap_information) obj;
+ String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId " +
+ " from web_site.tb_battmap_information,db_battinf.tb_battinf " +
+ " where tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
+ " and tb_battmap_information.StationId in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " +
+ " and tb_battmap_information.StationId=? ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{binfor.getNum(),binfor.getStationId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ BattMap_information binformation=new BattMap_information();
+ binformation.setNum(rs.getInt("num"));
+ binformation.setStationId(rs.getString("stationId"));
+ binformation.setStationName(rs.getString("stationName"));
+ binformation.setAddress(rs.getString("address"));
+ binformation.setLongitude(rs.getDouble("longitude"));
+ binformation.setLatitude(rs.getDouble("latitude"));
+ binformation.setInformation(rs.getString("information"));
+ binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+ list.add(binformation);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ } );
+ return list;
+ }
//9.1鏌ヨ鏈烘埧鎵�鍦ㄧ殑鎵�鏈夌渷浠�
public List serchStationName1(){
String sql=" SELECT DISTINCT substring_index(substring_index(address,'-',2),'-',1) as stationname1 FROM web_site.tb_BattMap_information " ;
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index 0357c75..d2daeb3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -50,7 +50,14 @@
String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,is_out_stand " +
",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2 " +
" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
- " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
+ " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+
+ " and tb_batt_endurance.stationid in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " ;
//鏈烘埧绛涢��
String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?";
sql+=stationSql;
@@ -79,7 +86,7 @@
//System.out.println(sql);
- List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()
+ List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bendurance.getNum(),"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()
,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -125,6 +132,7 @@
public static void main(String[] args) {
Batt_enduranceImpl bimpl=new Batt_enduranceImpl();
Batt_endurance ben=new Batt_endurance();
+ ben.setNum(1002);
ben.setStationName("");
ben.setStationName1("");
ben.setStationName2("");
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
index cb3f729..288bc51 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
@@ -57,6 +57,13 @@
String sql="select station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +
" from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +
" where tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +
+ " and tb_bts_station_event.station_id in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " +
" and record_datetime>=? and record_datetime<=? " +
" and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationid like ? " ;
/*//浜嬩欢绛涢��
@@ -74,7 +81,7 @@
String orderSql=" order by station_id,record_datetime,station_event_type asc ";
sql+=orderSql;
//System.err.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -300,6 +307,13 @@
String sql="select distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +
" from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +
" where tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +
+ " and tb_bts_station_event.station_id in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " +
" and dev_id=? " +
" and record_datetime>=? and record_datetime<=? ";
//鍩虹珯鐘舵��
@@ -318,7 +332,7 @@
//sql+=limitSql;
//,(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()
//executeQueryLimit
- List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {
+ List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getNum(),bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -371,7 +385,7 @@
BattInf binf = new BattInf();
- binf.setNum(0);
+ binf.setNum(1002);
binf.setStationName("");
binf.setStationName1("");
binf.setStationName2("");
@@ -387,12 +401,13 @@
bmd.setPage(p);
bmd.setBinf(binf);
bmd.setUinf(uinf);
- /* List<Bts_station_event> list=bimpl.serchByCondition(binf);
+ List<Bts_station_event> list=bimpl.serchByCondition(binf);
System.out.println(list.size());
for (Bts_station_event b : list) {
System.out.println(b.getNote()+" "+b.getDev_id()+" "+b.getStation_event_type_poff()+" "+b.getStation_event_type_xuhang()+" "+b.getStation_event_type_fadian()+" "+b.getStation_event_type_diaozhan()+" "+b.getStation_event_type_dooropen()+" "+b.getStation_event_type_tempup()+" "+b.getStation_event_type_templow()+" "+b.getStation_event_type_dampup()+" "+b.getStation_event_type_damplow()+" "+b.getStationName());
- }*/
+ }
Bts_station_event b=new Bts_station_event();
+ b.setNum(1002);
b.setDev_id(910000001);
b.setRecord_datetime(ActionUtil.getSimpDate(date1));
b.setRecord_datetime_end(ActionUtil.getSimpDate(date2));
@@ -401,8 +416,8 @@
page.setPageCurr(1);
page.setPageSize(10);
b.setPage(page);
- List list=bimpl.serchByInfo(b);
- System.out.println(list.size());
+ /*List list=bimpl.serchByInfo(b);
+ System.out.println(list.size());*/
}
}
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 4153aee..d1bd387 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
@@ -10,9 +10,11 @@
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.LimitNumberFactory;
+import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Page;
+import com.fgkj.dto.User_inf;
import com.fgkj.dto.ram.Bts_station_state;
public class Bts_station_stateImpl implements BaseDAO,CallBack{
@@ -52,10 +54,16 @@
" ,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_bts_station_state.station_id in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " +
" 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() {
+ List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getNum(),"%"+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();
@@ -111,19 +119,52 @@
}
return list;
}
-
+ //鏌ヨ褰撳墠鏈烘埧鍋滅數鏁�
+ public int serchByState(Object obj) {
+ User_inf uinf=(User_inf) obj;
+ String sql=" select count(*) as nums from db_ram_db.tb_bts_station_state where station_stat&2>1 " +
+ " and tb_bts_station_state.station_id in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
+ " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
+ " where db_user.tb_user_inf.uid=? ) " ;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ list.add(rs.getInt("nums"));
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//鎬绘暟
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
}
-
public static void main(String[] args) {
Bts_station_stateImpl bimpl=new Bts_station_stateImpl();
BattInf binf=new BattInf();
+ binf.setNum(1002);
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
binf.setStationId("");
+ User_inf uinf=new User_inf();
+ uinf.setUId(1002);
Page p=new Page();
p.setPageCurr(1);
p.setPageSize(1);
@@ -133,5 +174,9 @@
//System.out.println(bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_dooropen()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_xuhang()+" "+bs.getStation_stat_poff());
System.out.println(bs);
}
+ /*int nums=bimpl.serchByState(uinf);
+ System.out.println(nums);*/
}
+
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 9ac594a..919e00c 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -11,7 +11,7 @@
private Double latitude; // 绾害
private String information; //澶囨敞
private Integer FBSDeviceId; //璁惧id
-
+ private Page page;
public BattMap_information() {
super();
@@ -97,15 +97,27 @@
}
+ public Page getPage() {
+ return page;
+ }
+
+
+ public void setPage(Page page) {
+ this.page = page;
+ }
+
+
@Override
public String toString() {
return "BattMap_information [num=" + num + ", StationId=" + StationId
+ ", StationName=" + StationName + ", Address=" + Address
+ ", longitude=" + longitude + ", latitude=" + latitude
+ ", information=" + information + ", FBSDeviceId="
- + FBSDeviceId + "]";
+ + FBSDeviceId + ", page=" + page + "]";
}
+
+
}
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index db0b9b4..6d48fbb 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -86,10 +86,22 @@
}
return listAll;
}
-
- //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅
- public List searchUserManageStation(Object obj){
- List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid(obj);
+ //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅(鐢ㄦ埛绠＄悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
+ public ServiceModel searchUserManageStation(Object obj){
+ List list = ((BattMap_informationImpl)dao).serchInBattMapByUid(obj);
+ if(list!=null&&list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅(鐢ㄦ埛绠＄悊鐨勶紝鍒嗛〉鍒锋柊)
+ public List searchUserManageStation2(Object obj){
+ List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid2(obj);
List listAll=new ArrayList();//瀛樻斁鏈�鍚庣殑缁撴灉
String state="";
int numBadBatt=0;
@@ -131,7 +143,50 @@
}
return listAll;
}
-
+ //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
+ public List searchUserManageStation3(Object obj){
+ List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid3(obj);
+ List listAll=new ArrayList();//瀛樻斁鏈�鍚庣殑缁撴灉
+ String state="";
+ int numBadBatt=0;
+ int numAlarm=0;
+ int numPlan=0;
+ if(list!=null&&list.size()>0){
+ for(int i=0;i<list.size();i++){
+ state="item-normal";
+ ServiceModel model=new ServiceModel();
+ BattMap_information binformation = list.get(i);
+ if(binformation.getFBSDeviceId()/100000==6185){
+ BattInf binf=new BattInf();
+ binf.setFBSDeviceId(binformation.getFBSDeviceId());
+ state=(new Fbs9100_stateImpl().seachDevNow(binf));
+ }else{
+ numBadBatt=(new BadBatt_monImpl()).serchByStationId(binformation); //钀藉悗鎬绘暟
+ numAlarm=(new Battalarm_dataDAOImpl()).serchByStationId(binformation); //鍛婅鎬绘暟
+ numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation); //寤惰繜鎬绘暟
+ if(numBadBatt>0){
+ state="item-behind"; //钀藉悗鏈烘埧
+ }else{
+ if(numAlarm > 0){
+ state="item-warn"; //鍛婅鏈烘埧
+ }else{
+ if(numPlan > 0){
+ state="item-timeout"; //寤惰繜鏈烘埧
+ }
+ }
+ }
+ }
+ model.setData(list.get(i));
+ model.setCode(numAlarm); //鍛婅鎬绘暟
+ model.setSum(numBadBatt); //钀藉悗鎬绘暟
+ model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ model.setMsg(state); //61850鐘舵��
+ model.setMsgN(binformation.getFBSDeviceId().toString());
+ listAll.add(model);
+ }
+ }
+ return listAll;
+ }
//9.1鐧惧害鍦板浘瀹氫綅鏍规嵁鐪佷唤鏌ヨ鎵�鏈夎鍖哄煙鐨勬満鎴�
public List serchByCondition(Object obj){
List<BattMap_information> list =dao.serchByCondition(obj);
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
index 31ed580..10eec0b 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
@@ -4,6 +4,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
import com.fgkj.dto.ServiceModel;
public class Bts_station_stateService {
@@ -28,5 +29,11 @@
}
return model;
}
+ //鏌ヨ褰撳墠鏈烘埧鍋滅數鏁�
+ public ServiceModel serchByState(Object obj) {
+ int nums=((Bts_station_stateImpl)dao).serchByState(obj);
+ model.setNewsum(nums);
+ return model;
+ }
}
--
Gitblit v1.9.1