whyclxw
2020-11-02 f8b7ca9bc6b51c137053f16c1c7150a11aba13c4
DC25v
4个文件已修改
134 ■■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/actions/partinsystem/Dc25v_battAction.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/dto/Dc25v_batt.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc25v_battImpl.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/service/Dc25v_battService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/actions/partinsystem/Dc25v_battAction.java
@@ -19,6 +19,20 @@
        result=tojson(model);
        return SUCCESS;
    }
    //设备实时数据显示(前100笔数据服务器的时间)
    public String serchByInfo() {
        Dc25v_batt ac=ActionUtil.getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Dc25v_batt.class);
        ServiceModel model=service.serchByInfo(ac);
        result=tojson(model);
        return SUCCESS;
    }
    //设备历史数据查询
    public String serchHistory() {
        Dc25v_batt ac=ActionUtil.getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Dc25v_batt.class);
        ServiceModel model=service.serchHistory(ac);
        result=tojson(model);
        return SUCCESS;
    }
    
    
    
DyEnvir_system/src/com/fgkj/partinsystem/dto/Dc25v_batt.java
@@ -7,6 +7,7 @@
      private int num ;//,
      private int dev_id ;// '设备id',
      private Date record_time  ;//'2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
      private Date record_time1  ;//'2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
      private float output_vol ;//'输出电压',
      private float output_curr ;//'输出电流',
      private float input_vol ;//'输入电压',
@@ -102,10 +103,18 @@
    public void setNote(String note) {
        this.note = note;
    }
    public Date getRecord_time1() {
        return record_time1;
    }
    public void setRecord_time1(Date record_time1) {
        this.record_time1 = record_time1;
    }
    @Override
    public String toString() {
        return "Dc25v_batt [num=" + num + ", dev_id=" + dev_id
                + ", record_time=" + record_time + ", output_vol=" + output_vol
                + ", record_time=" + record_time + ", record_time1="
                + record_time1 + ", output_vol=" + output_vol
                + ", output_curr=" + output_curr + ", input_vol=" + input_vol
                + ", input_curr=" + input_curr + ", work_state=" + work_state
                + ", Under_vol_alarm=" + Under_vol_alarm + ", Over_vol_alarm="
DyEnvir_system/src/com/fgkj/partinsystem/impl/Dc25v_battImpl.java
@@ -3,6 +3,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.fgkj.dao.BaseDAO;
@@ -82,11 +83,84 @@
        return list;
    }
    //设备实时数据显示(前100笔数据服务器的时间)
    @Override
    public List serchByInfo(Object obj) {
        // TODO Auto-generated method stub
        return null;
        Dc25v_batt dc=(Dc25v_batt) obj;
        Date date=new Date();
        String table=DAOHelper.sdf_withOut.format(date);
        String sql=" select * from db_partinsystem_history.dc25v_batt_"+dc.getDev_id()+"_"+table+" where dev_id=? ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dc.getDev_id()}, new CallBack() {
            @Override
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        Dc25v_batt d=new Dc25v_batt();
                        d.setDev_id(rs.getInt("dev_id"));
                        d.setRecord_time(rs.getTimestamp("record_time"));
                        d.setOutput_vol(rs.getFloat("output_vol"));
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        list.add(d);
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                return list;
            }
        });
        return list;
    }
    //设备历史数据查询
    public List serchHistory(Object obj) {
        Dc25v_batt dc=(Dc25v_batt) obj;
        String table=DAOHelper.sdf_withOut.format(dc.getRecord_time());
        String sql=" select * from db_partinsystem_history.dc25v_batt_"+dc.getDev_id()+"_"+table+" "
                + "  where dev_id=?  and record_time >= ? and record_time <= ?  order by record_time asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dc.getDev_id(),dc.getRecord_time(),dc.getRecord_time1()}, new CallBack() {
            @Override
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        Dc25v_batt d=new Dc25v_batt();
                        d.setDev_id(rs.getInt("dev_id"));
                        d.setRecord_time(rs.getTimestamp("record_time"));
                        d.setOutput_vol(rs.getFloat("output_vol"));
                        d.setOutput_curr(rs.getFloat("output_curr"));
                        d.setInput_vol(rs.getFloat("input_vol"));
                        d.setInput_curr(rs.getFloat("input_curr"));
                        d.setWork_state(rs.getInt("work_state"));
                        d.setUnder_vol_alarm(rs.getInt("under_vol_alarm"));
                        d.setOver_vol_alarm(rs.getInt("over_vol_alarm"));
                        d.setOver_load_alarm(rs.getInt("over_load_alarm"));
                        d.setOver_tmp_alarm(rs.getInt("over_tmp_alarm"));
                        d.setShort_out_alarm(rs.getInt("short_out_alarm"));
                        list.add(d);
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                return list;
            }
        });
        return list;
    }
}
DyEnvir_system/src/com/fgkj/partinsystem/service/Dc25v_battService.java
@@ -4,6 +4,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
import com.fgkj.partinsystem.impl.Dc25v_battImpl;
import com.fgkj.services.ServiceModel;
public class Dc25v_battService {
@@ -28,6 +29,30 @@
        }
        return model;
    }
    //设备实时数据显示(前100笔数据服务器的时间)
    public ServiceModel serchByInfo(Object obj) {
        List list=dao.serchByInfo(obj);
        if(list!=null&&list.size()>0){
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
        }
        return model;
    }
    //设备历史数据查询
    public ServiceModel serchHistory(Object obj) {
        List list=((Dc25v_battImpl)dao).serchHistory(obj);
        if(list!=null&&list.size()>0){
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
        }
        return model;
    }
}