whyclxw
2020-11-02 00ac56cafcf98873aca5cd18cfe672d296f790f8
历史
4个文件已修改
102 ■■■■ 已修改文件
DyEnvir_system/src/com/fgkj/actions/partinsystem/Ac230v_upsAction.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/dto/Ac230v_ups.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/impl/Ac230v_upsImpl.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/partinsystem/service/Ac230v_upsService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DyEnvir_system/src/com/fgkj/actions/partinsystem/Ac230v_upsAction.java
@@ -27,7 +27,13 @@
        result=tojson(model);
        return SUCCESS;
    }
    //设备历史数据查询
    public String serchHistory() {
        Ac230v_ups ac=ActionUtil.getGson(ActionUtil.time_yyyyMMddHHmmss).fromJson(json, Ac230v_ups.class);
        ServiceModel model=service.serchHistory(ac);
        result=tojson(model);
        return SUCCESS;
    }
    public String getResult() {
        return result;
    }
DyEnvir_system/src/com/fgkj/partinsystem/dto/Ac230v_ups.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 DCInput_vol;// '直流输入电压',
      private float ACInput_vol;// '交流输入电压',
      private float batt_vol;// '蓄电池电压',
@@ -159,21 +160,30 @@
    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 "Ac230v_ups [num=" + num + ", dev_id=" + dev_id
                + ", record_time=" + record_time + ", DCInput_vol="
                + DCInput_vol + ", ACInput_vol=" + ACInput_vol + ", batt_vol="
                + batt_vol + ", batt_curr=" + batt_curr + ", ACOutput_vol="
                + ACOutput_vol + ", ACOutput_curr=" + ACOutput_curr
                + ", DCOutput_vol=" + DCOutput_vol + ", DCBus_vol=" + DCBus_vol
                + ", radiator_tmp=" + radiator_tmp + ", Thyristor_tmp="
                + Thyristor_tmp + ", Transfor_tmp=" + Transfor_tmp
                + ", ACInduc_tmp=" + ACInduc_tmp + ", DCInduc_tmp="
                + DCInduc_tmp + ", Environ_tmp=" + Environ_tmp
                + ", power_state_code=" + power_state_code + ", error_code="
                + error_code + ", work_state=" + work_state + ", fault_state="
                + fault_state + ", note=" + note + "]";
                + ", record_time=" + record_time + ", record_time1="
                + record_time1 + ", DCInput_vol=" + DCInput_vol
                + ", ACInput_vol=" + ACInput_vol + ", batt_vol=" + batt_vol
                + ", batt_curr=" + batt_curr + ", ACOutput_vol=" + ACOutput_vol
                + ", ACOutput_curr=" + ACOutput_curr + ", DCOutput_vol="
                + DCOutput_vol + ", DCBus_vol=" + DCBus_vol + ", radiator_tmp="
                + radiator_tmp + ", Thyristor_tmp=" + Thyristor_tmp
                + ", Transfor_tmp=" + Transfor_tmp + ", ACInduc_tmp="
                + ACInduc_tmp + ", DCInduc_tmp=" + DCInduc_tmp
                + ", Environ_tmp=" + Environ_tmp + ", power_state_code="
                + power_state_code + ", error_code=" + error_code
                + ", work_state=" + work_state + ", fault_state=" + fault_state
                + ", note=" + note + "]";
    }
      
}
DyEnvir_system/src/com/fgkj/partinsystem/impl/Ac230v_upsImpl.java
@@ -135,5 +135,50 @@
        });
        return list;
    }
    //设备历史数据查询
    public List serchHistory(Object obj) {
        Ac230v_ups ac=(Ac230v_ups) obj;
        String table=DAOHelper.sdf_withOut.format(ac.getRecord_time());
        String sql=" select * from db_partinsystem_history.ac230v_ups_"+ac.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[]{ac.getDev_id(),ac.getRecord_time(),ac.getRecord_time1()}, new CallBack() {
            @Override
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()){
                        Ac230v_ups a=new Ac230v_ups();
                        a.setDev_id(rs.getInt("dev_id"));
                        a.setRecord_time(rs.getTimestamp("record_time"));
                        a.setDCInput_vol(rs.getFloat("dCInput_vol"));
                        a.setACInput_vol(rs.getFloat("aCInput_vol"));
                        a.setBatt_vol(rs.getFloat("batt_vol"));
                        a.setBatt_curr(rs.getFloat("batt_curr"));
                        a.setACOutput_vol(rs.getFloat("aCOutput_vol"));
                        a.setACOutput_curr(rs.getFloat("aCOutput_curr"));
                        a.setDCOutput_vol(rs.getFloat("dCOutput_vol"));
                        a.setDCBus_vol(rs.getFloat("dCBus_vol"));
                        a.setRadiator_tmp(rs.getFloat("radiator_tmp"));
                        a.setThyristor_tmp(rs.getFloat("thyristor_tmp"));
                        a.setTransfor_tmp(rs.getFloat("transfor_tmp"));
                        a.setACInduc_tmp(rs.getFloat("aCInduc_tmp"));
                        a.setDCInduc_tmp(rs.getFloat("dCInduc_tmp"));
                        a.setEnviron_tmp(rs.getFloat("environ_tmp"));
                        a.setPower_state_code(rs.getInt("power_state_code"));
                        a.setError_code(rs.getInt("error_code"));
                        a.setWork_state(rs.getInt("work_state"));
                        a.setFault_state(rs.getInt("fault_state"));
                        list.add(a);
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                return list;
            }
        });
        return list;
    }
}
DyEnvir_system/src/com/fgkj/partinsystem/service/Ac230v_upsService.java
@@ -4,6 +4,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
import com.fgkj.partinsystem.impl.Ac230v_upsImpl;
import com.fgkj.services.ServiceModel;
public class Ac230v_upsService {
@@ -41,5 +42,17 @@
        }
        return model;
    }
    //设备历史数据查询
    public ServiceModel serchHistory(Object obj) {
        List list=((Ac230v_upsImpl)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;
    }
}