From 3221d91c0bac4f71ea2410382e633e76a3357baf Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期三, 26 九月 2018 10:45:55 +0800
Subject: [PATCH] 电池续航
---
gx_tieta/src/com/fgkj/dao/BaseDAO.java | 2 +
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 12 +++++
gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java | 33 ++++++++++++++++
gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java | 2 +
gx_tieta/src/com/fgkj/services/Batt_enduranceService.java | 32 ++++++++++++++++
5 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
new file mode 100644
index 0000000..2ac9952
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
@@ -0,0 +1,33 @@
+package com.fgkj.actions;
+
+import com.fgkj.dto.Batt_endurance;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.services.Batt_enduranceService;
+
+public class Batt_enduranceAction extends ActionUtil{
+ private Batt_enduranceService service=new Batt_enduranceService();
+ private String json;
+ private String result;
+
+ //缁埅鏃堕棿鐨勬煡璇�
+ public String serchByCondition() {
+ Batt_endurance bendurance=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_endurance.class);
+ ServiceModel model=service.serchByCondition(bendurance);
+ result=tojson(model);
+ return SUCCESS;
+ }
+
+
+
+
+ public String getResult() {
+ return result;
+ }
+ public void setJson(String json) {
+ this.json = json;
+ }
+
+
+
+
+}
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAO.java b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
index 317f591..a9691ce 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAO.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
@@ -176,6 +176,8 @@
public static final int BATT_DEVALARM_DATA_HISTORY = 86;
+ public static final int BATT_ENDURANCE=87;
+
public boolean add(Object obj); // 娣诲姞
public boolean update(Object obj); // 鏇存柊
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index 12b5793..60ba796 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -18,6 +18,7 @@
import com.fgkj.dao.impl.Batt_devalarm_data_historyImpl;
import com.fgkj.dao.impl.Batt_devdischarge_paramImpl;
import com.fgkj.dao.impl.Batt_electricityImpl;
+import com.fgkj.dao.impl.Batt_enduranceImpl;
import com.fgkj.dao.impl.Batt_historyImpl;
import com.fgkj.dao.impl.Batt_maint_infAgainImpl;
import com.fgkj.dao.impl.Batt_maint_infImpl;
@@ -182,6 +183,7 @@
case 84:return new Positiomap_usrImpl();
case 85:return new Battalarm_data_historyImpl();
case 86:return new Batt_devalarm_data_historyImpl();
+ case 87:return new Batt_enduranceImpl();
default :return null;
}
}
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 146d94b..490600b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -41,7 +41,7 @@
//缁埅鏃堕棿鐨勬煡璇�
public List serchByCondition(Object obj) {
Batt_endurance bendurance=(Batt_endurance) obj;
- String sql="select distinct num,deviceid,tb_batt_endurance.stationid,endurance_state,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_timelong " +
+ String sql="select distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,endurance_state,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_timelong " +
",db_battinf.tb_battinf.StationName " +
" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
@@ -66,6 +66,7 @@
}
//鎺掑簭鏃堕棿
String orderSql=" order by endurance_timelong asc";
+ //System.out.println(sql);
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationid()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -98,5 +99,14 @@
// TODO Auto-generated method stub
return null;
}
+ public static void main(String[] args) {
+ Batt_enduranceImpl bimpl=new Batt_enduranceImpl();
+ Batt_endurance ben=new Batt_endurance();
+ ben.setStationid("");
+ ben.setEndurance_state(0);
+ ben.setEndurance_timelong(0);
+ List list=bimpl.serchByCondition(ben);
+ System.out.println(list.size());
+ }
}
diff --git a/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java b/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
new file mode 100644
index 0000000..20c5446
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
@@ -0,0 +1,32 @@
+package com.fgkj.services;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dto.ServiceModel;
+
+public class Batt_enduranceService {
+ private BaseDAO dao;
+ private ServiceModel model;
+
+ public Batt_enduranceService() {
+ super();
+ dao =BaseDAOFactory.getBaseDAO(BaseDAO.BATT_ENDURANCE);
+ model = new ServiceModel();
+ }
+ //缁埅鏃堕棿鐨勬煡璇�
+ public ServiceModel serchByCondition(Object obj) {
+ List list=dao.serchByCondition(obj);
+ if(list.size()>0&&list!=null){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+
+}
--
Gitblit v1.9.1