From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
index e8f42a8..69e293d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -1,5 +1,6 @@
package com.fgkj.dao.impl;
+import java.sql.Blob;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -14,6 +15,7 @@
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Deverror_record;
import com.fgkj.dto.Page;
+import com.fgkj.dto.User_Chart;
public class Deverror_recordImpl implements BaseDAO,CallBack{
@@ -24,8 +26,36 @@
//鐢ㄦ埛鎵嬪姩娣诲姞闂
public boolean add(Object obj) {
Deverror_record dev_record=(Deverror_record) obj;
- String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,uid) values(?,?,?,?)";
- boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getStationId(),dev_record.getRecord_time(),dev_record.getError_descript(),dev_record.getUid()});
+ String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,uid,picture_num ";
+ String endsql=") values(?,?,?,?,?";
+ List list=new ArrayList();
+ list.add(dev_record.getStationId());
+ list.add(dev_record.getRecord_time());
+ list.add(dev_record.getError_descript());
+ list.add(dev_record.getUid());
+ list.add(dev_record.getPicture_num());
+ if(dev_record.getPicture_num()>=1){
+ sql+=",picture_one";
+ endsql+=",? ";
+ list.add(dev_record.getPicture_one());
+ }
+ if(dev_record.getPicture_num()>=2){
+ sql+=",picture_two";
+ endsql+=",? ";
+ list.add(dev_record.getPicture_two());
+ }if(dev_record.getPicture_num()>=3){
+ sql+=",picture_three";
+ endsql+=",? ";
+ list.add(dev_record.getPicture_three());
+ }if(dev_record.getPicture_num()>=4){
+ sql+=",picture_four";
+ endsql+=",? ";
+ list.add(dev_record.getPicture_four());
+ }
+ endsql+=")";
+ sql+=endsql;
+ //System.err.println(sql);
+ boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);
return bl;
}
@@ -49,15 +79,23 @@
Page p=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,picture_num " +
" ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
" from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
" where tb_deverror_record.stationid=tb_battinf.stationid " +
" and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ? " +
- " and tb_deverror_record.uid=? and error_en=0 " +
- " order by record_time desc " +
- " limit ?,? ";
- List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
+ " and tb_deverror_record.uid=? and error_en=0 " ;
+ //鐢ㄦ埛绠＄悊
+ String userSql=" and db_battinf.tb_battinf.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=? "+
+ " ) ";
+ sql+=userSql;
+
+ String orderSql=" order by record_time desc ";
+ sql+=orderSql;
+ String limitSql=" limit ?,? ";
+ sql+=limitSql;
+ List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getNum()
,binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -75,6 +113,7 @@
dev_record.setRecord_time(rs.getTimestamp("record_time"));
dev_record.setError_descript(rs.getString("error_descript"));
dev_record.setError_en(rs.getInt("error_en"));
+ dev_record.setPicture_num(rs.getInt("picture_num"));
Page page=new Page();
dev_record.setPage(page);
list.add(dev_record);
@@ -94,16 +133,35 @@
return list;
}
- public List serchByInfo(Object obj) {
- // TODO Auto-generated method stub
- return null;
+ //鏍规嵁num鍜屽垪鍚嶆煡璇㈠浘鐗�(note鏀惧垪鍚嶅瓧)
+ public List serchByInfo(Object obj){
+ final Deverror_record dev_record=(Deverror_record) obj;
+ String sql="select "+dev_record.getNote()+" from db_battinf.tb_deverror_record where num=? ";
+ List list=DAOHelper.executeQueryPicture(sql, DBUtil.getConn(), new Object[]{dev_record.getNum()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Blob blob=rs.getBlob(dev_record.getNote());
+ list.add(blob);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+
}
public static void main(String[] args) {
Deverror_recordImpl dimpl=new Deverror_recordImpl();
BattInf binf=new BattInf();
binf.setNum(1002);
binf.setStationName("");
- binf.setStationName1("");
+ binf.setStationName1("婀栧寳鐪�");
binf.setStationName2("");
binf.setStationName3("");
binf.setStationName5("");
@@ -112,7 +170,8 @@
p.setPageCurr(1);
p.setPageSize(10);
binf.setPage(p);
- dimpl.serchByCondition(binf);
+ List list=dimpl.serchByCondition(binf);
+ System.out.println(list.size());
}
}
--
Gitblit v1.9.1