From 0ee2a92da94c0b97f7c9c48b4a30a80a810304cd Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 13:20:20 +0800
Subject: [PATCH] 落后单体查询。ld9查询， 电池实时状态查询添加市级筛选
---
gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java | 9 +++++----
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 4 ++--
gx_tieta/src/com/fgkj/dao/impl/Ld9/BadLd9_monImpl.java | 4 ++--
gx_tieta/src/com/fgkj/dao/BattTestData.java | 5 ++++-
gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java | 4 ++--
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 3723b1c..8912670 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -1,7 +1,10 @@
package com.fgkj.dao;
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 BATT_MON_COUNT_MAX = 512;
final public static byte BATTDATA_NULL = 0;
final public static byte BATTDATA_FLOAT = 1;
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index aa535b0..5e32997 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -301,7 +301,7 @@
"FROM web_site.tb_badbatt_mon,db_battinf.tb_battinf " +
"where web_site.tb_badbatt_mon.battgroupid=db_battinf.tb_battinf.BattGroupId " +
"and test_starttime>=? and test_starttime<=? " +
- "and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?";
+ "and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? ";
//閫夊彇钃勭數姹犵粍鏉′欢
String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? ";
@@ -325,7 +325,7 @@
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
List<Batt_Maint_Dealarm> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{
- binf.getBattProductDate(),binf.getBattProductDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%",
+ binf.getBattProductDate(),binf.getBattProductDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
binf.getBattGroupId(),uinf.getUId(),
(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index 22b9fb4..38f8ff1 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -622,7 +622,7 @@
" and db_user.tb_user_inf.uid=? )";
baseSql+=userSql;
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? ";
+ String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -638,7 +638,7 @@
String limitSql=" limit ?,?";
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
,binf.getNum(),(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java
index 75cc4c9..2a164cd 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattinfThirdImpl.java
@@ -10,6 +10,7 @@
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BattTestData;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.db.DBUtil;
@@ -131,11 +132,11 @@
String endSql=" order by db_battinf.tb_battinf.battgroupid ";
sqlT+=endSql;
sqlE+=endSql;
- if(tdata.getTest_type()==3){
+ if(tdata.getTest_type()==BattTestData.BATT_DISCHARGE){
sql=sqlT;
//System.out.println(sql);
list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getStationName1(),binf.getStationName()},new BattinfThirdImpl());
- }else if(tdata.getTest_type()==5){
+ }else if(tdata.getTest_type()==BattTestData.BATT_RES){
sql=sqlE;
//System.out.println(sql);
list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getStationName1(),binf.getStationName()},new CallBack() {
@@ -246,11 +247,11 @@
sqlT+=stationSqlF+tendSql;
sqlE+=stationSqlF+eendSql;
}
- if(tdata.getTest_type()==3){
+ if(tdata.getTest_type()==BattTestData.BATT_DISCHARGE){
sql=sqlT;
//System.out.println(sql);
list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getMonNum(),binf.getStationName1(),binf.getStationName2(),binf.getStationName()},new BattinfThirdImpl());
- }else if(tdata.getTest_type()==5){
+ }else if(tdata.getTest_type()==BattTestData.BATT_RES){
sql=sqlE;
//System.out.println(sql);
list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattGroupId(),tdata.getTest_type(),binf.getMonNum()*10+1,binf.getStationName1(),binf.getStationName2(),binf.getStationName()},new CallBack() {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Ld9/BadLd9_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Ld9/BadLd9_monImpl.java
index 5113d2a..6e188f2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Ld9/BadLd9_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Ld9/BadLd9_monImpl.java
@@ -177,7 +177,7 @@
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
baseSql+=userSql;
String endSql=" ORDER BY web_site.tb_badld9_mon.battgroupid asc ";
@@ -186,7 +186,7 @@
//System.out.println(sql);
List<Batt_Maint_Dealarm> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{
binf.getBattProductDate(),binf.getBattProductDate1(),
- binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%",
+ binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1