From 339f905b431d73e2223bd81dd05db5054daad212 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:58:36 +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/Battinf_applyImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index 758c1e7..367fe80 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -22,6 +22,8 @@
import com.fgkj.dto.Page;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.User_log;
+import com.fgkj.dto.ram.FBS9100;
+import com.fgkj.dto.ram.Fbs9100_state;
import com.fgkj.services.User_logService;
public class Battinf_applyImpl implements BaseDAO,CallBack{
@@ -542,7 +544,34 @@
return false;
}
}
-
+ //鐢宠琛ㄤ腑宸插鎵归�氳繃鐨勮澶囪繛鎺ユ暟
+ public List devCommNum() {
+ String sql=" select distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount " +
+ " from db_battinf.tb_battinf_apply,db_ram_db.tb_fbs9100_state " +
+ " where apply_en=1 and db_battinf.tb_battinf_apply.FbsDeviceId=db_ram_db.tb_fbs9100_state.dev_id "
+ + " order by apply_date desc" ;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+
+ @Override
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()) {
+ Fbs9100_state fbs=new Fbs9100_state();
+ fbs.setDev_id(rs.getInt("FbsDeviceId"));
+ fbs.setDev_commcount(rs.getInt("dev_commcount"));
+ list.add(fbs);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+
+ }
public static void main(String[] args) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date1 = sdf.parse("2000-01-01 00:00:00");
@@ -607,7 +636,11 @@
System.out.println(station_id);
int battgroup_id=BattinfGroupFactory.searchMaxBattgroupId();
System.out.println(battgroup_id);*/
- boolean bl=bimpl.judgeBattInOrNot(binf);
- System.out.println(bl);
+ /*boolean bl=bimpl.judgeBattInOrNot(binf);
+ System.out.println(bl);*/
+ /*List<Fbs9100_state> list=bimpl.devCommNum();
+ for (Fbs9100_state f : list) {
+ System.out.println(f.getDev_id()+" "+f.getDev_commcount());
+ }*/
}
}
--
Gitblit v1.9.1