From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
index 1f03434..49c59e7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
@@ -195,7 +195,6 @@
binf.setStationName9(BattResAndTest.alarm2Tostring(rs.getInt("dcdc_SMR_Alarm2")));
fbs9100.setBinf(binf);
list.add(fbs9100);
-
if(rs.isLast()&&list.size()<2){
list.add(cloneDcdc(fbs9100));
}
@@ -213,10 +212,53 @@
});
return list;
}
-
+ //瀹炴椂椤甸潰鎷撴墤鍥句腑鏄剧ず璁惧鐨勪袱涓猟cdc
public List serchByInfo(Object obj) {
- // TODO Auto-generated method stub
- return null;
+ Fbs9100s_dcdc_state dcdc=(Fbs9100s_dcdc_state) obj;
+ String sql=" select DISTINCT db_ram_db.tb_fbs9100s_dcdc_state.num,dev_id,dcdc_Vsys,dcdc_Vout,dcdc_Vbat,dcdc_Iout,dcdc_Ibuck" +
+ ",dcdc_Tmp_Dis, dcdc_Tmp_Chr,dcdc_SMR_Alarm1,dcdc_SMR_Alarm2,dcdc_version" +
+ ",dcdc_ModeSetComm,dcdc_RunSetComm,dcdc_BuckISet,dcdc_DisVolSet,dcdc_DisCurrSet" +
+ ",dcdc_CommTxCnt,dcdc_CommRxCnt" +
+ " from db_ram_db.tb_fbs9100s_dcdc_state " +
+ " where db_ram_db.tb_fbs9100s_dcdc_state.dev_id=? " +
+ " order by db_ram_db.tb_fbs9100s_dcdc_state.num asc";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dcdc.getDev_id()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Fbs9100s_dcdc_state fd=new Fbs9100s_dcdc_state();
+ fd.setDev_id(rs.getInt("dev_id"));
+ fd.setDcdc_Vsys(rs.getFloat("dcdc_Vsys"));
+ fd.setDcdc_Vout(rs.getFloat("dcdc_Vout"));
+ fd.setDcdc_Vbat(rs.getFloat("dcdc_Vbat"));
+ fd.setDcdc_Iout(rs.getFloat("dcdc_Iout"));
+ fd.setDcdc_Ibuck(rs.getFloat("dcdc_Ibuck"));
+ fd.setDcdc_Tmp_Dis(rs.getFloat("dcdc_Tmp_Dis"));
+ fd.setDcdc_Tmp_Chr(rs.getFloat("dcdc_Tmp_Chr"));
+ fd.setDcdc_SMR_Alarm1(rs.getInt("dcdc_SMR_Alarm1"));
+ fd.setDcdc_SMR_Alarm1_16(Integer.toHexString(rs.getInt("dcdc_SMR_Alarm1")));
+ fd.setDcdc_SMR_Alarm2(rs.getInt("dcdc_SMR_Alarm2"));
+ fd.setDcdc_SMR_Alarm2_16(Integer.toHexString(rs.getInt("dcdc_SMR_Alarm2")));
+ fd.setDcdc_version(rs.getInt("dcdc_version"));
+ fd.setDcdc_ModeSetComm(rs.getInt("dcdc_ModeSetComm"));
+ fd.setDcdc_RunSetComm(rs.getInt("dcdc_RunSetComm"));
+ fd.setDcdc_BuckISet(rs.getFloat("dcdc_BuckISet"));
+ fd.setDcdc_DisVolSet(rs.getFloat("dcdc_DisVolSet"));
+ fd.setDcdc_DisCurrSet(rs.getFloat("dcdc_DisCurrSet"));
+ fd.setDcdc_CommRxCnt(rs.getInt("dcdc_CommRxCnt"));
+ fd.setDcdc_CommTxCnt(rs.getInt("dcdc_CommTxCnt"));
+ list.add(fd);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
}
//褰揹cdc涓彧瀛樹簡涓�绗旀暟鎹椂copy涓�浠芥暟鎹叏涓�0鐨勫璞�
public static FBS9100 cloneDcdc(FBS9100 fbs){
@@ -259,17 +301,22 @@
Fbs9100s_dcdc_stateImpl fimpl=new Fbs9100s_dcdc_stateImpl();
FBS9100 fbs=new FBS9100();
Fbs9100s_dcdc_state fbs9100=new Fbs9100s_dcdc_state();
- fbs9100.setDev_id(91000001);
+ fbs9100.setDev_id(910000575);
fbs.setFd(fbs9100);
BattInf binf=new BattInf();
- binf.setStationName("婀栧寳鐪�-閯傚窞甯�-涓佸鑰佸眿鍩虹珯-閾佸鍩虹珯");
- binf.setStationName1("婀栧寳鐪�");
- binf.setFBSDeviceName("FBS-9100S-6");
+ //binf.setStationName("婀栧寳鐪�-閯傚窞甯�-涓佸鑰佸眿鍩虹珯-閾佸鍩虹珯");
+ //binf.setStationName1("婀栧寳鐪�");
+ //binf.setFBSDeviceName("FBS-9100S-6");
fbs.setBinf(binf);
- List<FBS9100> list=fimpl.serchByCondition(fbs);
+ /*List<FBS9100> list=fimpl.serchByCondition(fbs);
for (FBS9100 fbs_91 : list) {
System.out.println(fbs_91);
}
+ System.out.println(list.size());*/
+ List<Fbs9100s_dcdc_state> list=fimpl.serchByInfo(fbs9100);
+ for (Fbs9100s_dcdc_state dcdc : list) {
+ System.out.println(dcdc);
+ }
System.out.println(list.size());
}
--
Gitblit v1.9.1