~whyclxw/LithiumBms.git

			@@ -23,7 +23,7 @@
			public List<BatttestdataId> getTdataById(Integer devId, Integer testRecordCount) {
			String sql="select * from db_batt_testdata.tb_batttestdata_" +devId
			+" where need_test=1 and test_record_count="+testRecordCount+" ";
			sql+=" ORDER BY test_starttime asc ";
			sql+=" ORDER BY record_num asc ";
			System.out.println(sql);
			List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			@@ -49,7 +49,7 @@
			tdata.setMonCurr(rs.getDouble("mon_curr"));
			tdata.setMonCap(rs.getDouble("mon_cap"));
			tdata.setMonWh(rs.getDouble("mon_wh"));
			tdata.setMonState(rs.getInt("mon_state"));
			tdata.setMonState(rs.getString("mon_state"));
			tdata.setMonFault(rs.getString("mon_fault"));
			tdata.setNeedTest(rs.getInt("need_test"));
			list.add(tdata);
			@@ -86,6 +86,7 @@
			" where tb_battgroup_baojigroup.baoji_group_id=tb_battgroup_usr.baoji_group_id" +
			" and uid="+dto.getUid()+
			")";
			sql+=" order by alm_starttime desc ";
			List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			@@ -130,7 +131,7 @@
			" where tb_battgroup_baojigroup.baoji_group_id=tb_battgroup_usr.baoji_group_id" +
			" and uid="+dto.getUid()+
			")";
			sql+=" ORDER BY alm_starttime asc limit "+dto.getLimitStart()+","+dto.getLimitEnd()+" ";
			sql+=" ORDER BY alm_starttime desc limit "+dto.getLimitStart()+","+dto.getLimitEnd()+" ";
			List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
			@Override
			public List getResults(ResultSet rs) throws SQLException {
			@@ -139,6 +140,7 @@
			DevalarmDataYear dataYear=new DevalarmDataYear();
			dataYear.setNum(rs.getInt("num"));
			dataYear.setDevId(rs.getInt("dev_id"));
			dataYear.setAlmId(rs.getInt("alm_id"));
			dataYear.setAlmSignalId(rs.getInt("alm_signal_id"));
			dataYear.setAlmStarttime(rs.getTimestamp("alm_starttime"));
			dataYear.setAlmValue(rs.getFloat("alm_value"));