From cf32b80c2d909de33e4c3e107ee96e1b2358bbfc Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期二, 25 九月 2018 16:45:04 +0800
Subject: [PATCH] 左侧导航排序

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java        |    8 +-
 gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java |   46 +++++++++++++++
 gx_tieta/src/com/fgkj/dto/Batt_endurance.java          |   73 ++++++++++++++++++++++++
 3 files changed, 124 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index c35bdf7..dc51a74 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3251,7 +3251,7 @@
 				" FROM db_battinf.tb_battinf " +
 				" where StationId in(" +
 				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
-				" )";
+				" ) ORDER BY CONVERT( StationName1 USING gbk ) COLLATE gbk_chinese_ci ASC";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -3279,7 +3279,8 @@
 				" FROM db_battinf.tb_battinf " +
 				" where StationId in(" +
 				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
-				" ) and StationName1 like ?";
+				" ) and StationName1 like ? " +
+				" ORDER BY CONVERT( StationName2 USING gbk ) COLLATE gbk_chinese_ci ASC ";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%"},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -3307,7 +3308,8 @@
 				" FROM db_battinf.tb_battinf " +
 				" where StationId in(" +
 				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
-				" ) and StationName1 like ? and StationName2 like ? ";
+				" ) and StationName1 like ? and StationName2 like ?  " +
+				" ORDER BY CONVERT( StationName3 USING gbk ) COLLATE gbk_chinese_ci ASC ";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
new file mode 100644
index 0000000..61e3867
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -0,0 +1,46 @@
+package com.fgkj.dao.impl;
+
+import java.sql.ResultSet;
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.CallBack;
+
+public class Batt_enduranceImpl implements BaseDAO,CallBack{
+
+	public List getResults(ResultSet rs) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean add(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean update(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean del(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public List searchAll() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    //缁埅鏃堕棿鐨勬煡璇�
+	public List serchByCondition(Object obj) {
+		
+		return null;
+	}
+
+	public List serchByInfo(Object obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
new file mode 100644
index 0000000..93a37d8
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -0,0 +1,73 @@
+package com.fgkj.dto;
+
+import java.io.Serializable;
+
+public class Batt_endurance implements Serializable{
+	private int num;
+	private int deviceId;
+	private String stationid;
+	private int endurance_state;
+	private float real_cap;
+	private float moncapstd;
+	private float real_curr;
+	private int endurance_timelong;
+	public int getNum() {
+		return num;
+	}
+	public void setNum(int num) {
+		this.num = num;
+	}
+	public int getDeviceId() {
+		return deviceId;
+	}
+	public void setDeviceId(int deviceId) {
+		this.deviceId = deviceId;
+	}
+	public String getStationid() {
+		return stationid;
+	}
+	public void setStationid(String stationid) {
+		this.stationid = stationid;
+	}
+	public int getEndurance_state() {
+		return endurance_state;
+	}
+	public void setEndurance_state(int endurance_state) {
+		this.endurance_state = endurance_state;
+	}
+	public float getReal_cap() {
+		return real_cap;
+	}
+	public void setReal_cap(float real_cap) {
+		this.real_cap = real_cap;
+	}
+	public float getMoncapstd() {
+		return moncapstd;
+	}
+	public void setMoncapstd(float moncapstd) {
+		this.moncapstd = moncapstd;
+	}
+	public float getReal_curr() {
+		return real_curr;
+	}
+	public void setReal_curr(float real_curr) {
+		this.real_curr = real_curr;
+	}
+	public int getEndurance_timelong() {
+		return endurance_timelong;
+	}
+	public void setEndurance_timelong(int endurance_timelong) {
+		this.endurance_timelong = endurance_timelong;
+	}
+	@Override
+	public String toString() {
+		return "Batt_endurance [num=" + num + ", deviceId=" + deviceId
+				+ ", stationid=" + stationid + ", endurance_state="
+				+ endurance_state + ", real_cap=" + real_cap + ", moncapstd="
+				+ moncapstd + ", real_curr=" + real_curr
+				+ ", endurance_timelong=" + endurance_timelong + "]";
+	}
+	
+	
+
+}

--
Gitblit v1.9.1