From b268b39629bcc2dfbac978b5c53b67db3b71a839 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 04 一月 2019 14:03:16 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Fbs9100_setparam.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/AlarmDaoFactory.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 29 ++++++++++++++++++++++++++---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class | 0
8 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/AlarmDaoFactory.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/AlarmDaoFactory.class
index 5228193..d3bda99 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/AlarmDaoFactory.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/AlarmDaoFactory.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
index 0a8d468..d44143e 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
index 6417e91..8342a0e 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class
index 1edf628..d771bf3 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class
index ebe9a26..e8abf52 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Fbs9100_setparam.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Fbs9100_setparam.class
index a2f73ee..1418420 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Fbs9100_setparam.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/ram/Fbs9100_setparam.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class
index 6d4ccf2..c6d261d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
index 583949e..06b95ee 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -905,7 +905,28 @@
+ " 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_battgroup_baojigroup_usr.uId=? "
+ " and db_battinf.tb_battinf.MonVolStd=? ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getNum(),binf.getMonVolStd()}, new CallBack() {
+ //鏉′欢
+ String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
+ String sql1=" and stationname1=? ";//鐪�
+ String sql2=" and stationname2=? ";//甯�
+ String sql5=" and stationname5=? ";//鍖哄幙
+ switch (binf.getNum()) {
+ case 0:
+ sql+=sql0;
+ break;
+ case 1:
+ sql+=sql1;
+ break;
+ case 2:
+ sql+=sql2;
+ break;
+ case 5:
+ sql+=sql5;
+ break;
+ default:
+ return null;
+ }
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getBattGroupId(),binf.getMonVolStd(),binf.getStationName()}, new CallBack() {
@Override
public List getResults(ResultSet rs) {
@@ -973,8 +994,10 @@
p.setPageCurr(1);
fs.setPage(p);
BattInf binf=new BattInf();
- binf.setNum(1002);
- binf.setMonVolStd(12f);
+ binf.setNum(1);
+ binf.setBattGroupId(1002);
+ binf.setStationName("骞胯タ鐪�");
+ binf.setMonVolStd(2f);
/*List<Fbs9100_state> list=fi.serchByCondition(fs);
System.out.println(list.size());
for(Fbs9100_state f:list){
--
Gitblit v1.9.1