历史修改

81041

2019-06-24 9366932b852236f12f613c3c43d60c16143ed50a

历史修改

 sensor/src/com/fgkj/actions/Sensor_hisdataAction.java

New file
@@ -0,0 +1,32 @@
package com.fgkj.actions;



import com.fgkj.dto.Sensor_hisdata;

import com.fgkj.dto.ServiceModel;

import com.fgkj.services.Sensor_hisdataService;



public class Sensor_hisdataAction extends ActionUtil{

    private Sensor_hisdataService service=new Sensor_hisdataService();

    private String json;

    private String result;

	
    //根据设备id查询历史记录

    public String serchByCondition() {

        Sensor_hisdata sdata=getGson().fromJson(json, Sensor_hisdata.class);

        ServiceModel model=service.serchByCondition(sdata);

        result=tojson(model);

        return json;

    }

	
	
	
	
    public String getResult() {

        return result;

    }

    public void setJson(String json) {

        this.json = json;

    }

	


	
}


 sensor/src/com/fgkj/dao/BaseDAO.java

@@ -32,6 +32,8 @@
    

    public static final int  SERVER_STATE=13;

    

    public static final int  SENSOR_HISDATA=14;

	
    

    public boolean add(Object obj); // 添加




 sensor/src/com/fgkj/dao/BaseDAOFactory.java

@@ -3,6 +3,7 @@
import com.fgkj.dao.impl.CustompageImpl;

import com.fgkj.dao.impl.Echarts_usrImpl;

import com.fgkj.dao.impl.Process_surveyImpl;

import com.fgkj.dao.impl.Sensor_hisdataImpl;

import com.fgkj.dao.impl.Sensor_infImpl;

import com.fgkj.dao.impl.Sensor_mapinfoImpl;

import com.fgkj.dao.impl.Sensor_stateImpl;

@@ -37,6 +38,7 @@
            case 11:return new Vip_userImpl();

            case 12:return new Hard_dev_sms_stateImpl();

            case 13:return new Server_stateImpl();

            case 14:return new Sensor_hisdataImpl();

            default :return null;

        }

    }


 sensor/src/com/fgkj/dao/impl/Sensor_hisdataImpl.java

New file
@@ -0,0 +1,99 @@
package com.fgkj.dao.impl;



import java.sql.ResultSet;

import java.sql.SQLException;

import java.util.ArrayList;

import java.util.List;



import com.fgkj.dao.BaseDAO;

import com.fgkj.dao.CallBack;

import com.fgkj.dao.DAOHelper;

import com.fgkj.db.DBUtil;

import com.fgkj.dto.Sensor_hisdata;



public class Sensor_hisdataImpl implements BaseDAO,CallBack{



    @Override

    public List getResults(ResultSet rs) {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public boolean add(Object obj) {

        // TODO Auto-generated method stub

        return false;

    }



    @Override

    public boolean update(Object obj) {

        // TODO Auto-generated method stub

        return false;

    }



    @Override

    public boolean del(Object obj) {

        // TODO Auto-generated method stub

        return false;

    }



    @Override

    public List searchAll() {

        // TODO Auto-generated method stub

        return null;

    }

    //根据设备id查询历史记录

    @Override

    public List serchByCondition(Object obj) {

        Sensor_hisdata sdata=(Sensor_hisdata) obj;

        String sql=" select distinct num,sensor_dev_id,record_time,airtmp,airhum,smoke,water,lightintensity"

                + "  ,CO2concentration,COconcentration,CH4concentration,O2concentration,note "

                + "  from db_sensor_history.tb_sensor_hisdata_"+sdata.getSensor_dev_id()

                + "  where sensor_dev_id=? order by record_time asc ";

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{sdata.getSensor_dev_id()}, new CallBack() {

			
            @Override

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()){

                        Sensor_hisdata s=new Sensor_hisdata();

                        s.setNum(rs.getInt("num"));

                        s.setSensor_dev_id(rs.getInt("sensor_dev_id"));

                        s.setRecord_time(rs.getTimestamp("record_time"));

                        s.setAirtmp(rs.getFloat("airtmp"));

                        s.setAirhum(rs.getFloat("airhum"));

                        s.setSmoke(rs.getInt("smoke"));

                        s.setWater(rs.getInt("water"));

                        s.setLightintensity(rs.getInt("lightintensity"));

                        s.setCO2concentration(rs.getInt("cO2concentration"));

                        s.setCOconcentration(rs.getInt("cOconcentration"));

                        s.setCH4concentration(rs.getInt("cH4concentration"));

                        s.setO2concentration(rs.getInt("o2concentration"));

                        s.setNote(rs.getString("note"));

                        list.add(s);

                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        });

        return list;

    }



    @Override

    public List serchByInfo(Object obj) {

        // TODO Auto-generated method stub

        return null;

    }

    public static void main(String[] args) {

        Sensor_hisdataImpl simpl=new Sensor_hisdataImpl();

        Sensor_hisdata sdata=new Sensor_hisdata();

        sdata.setSensor_dev_id(291200001);

        List list=simpl.serchByCondition(sdata);

        System.out.println(list.size());

		
    }

}


 sensor/src/com/fgkj/dto/Sensor_hisdata.java

New file
@@ -0,0 +1,114 @@
package com.fgkj.dto;



import java.io.Serializable;

import java.util.Date;



public class Sensor_hisdata implements Serializable{

    private int num;

    private int sensor_dev_id;

    private Date record_time;

    private float airtmp;

    private float airhum;

    private int  smoke;

    private int water;

    private int lightintensity;

    private int CO2concentration;

    private int COconcentration;

    private int CH4concentration;

    private int O2concentration;

    private String note;

    public int getNum() {

        return num;

    }

    public void setNum(int num) {

        this.num = num;

    }

    public int getSensor_dev_id() {

        return sensor_dev_id;

    }

    public void setSensor_dev_id(int sensor_dev_id) {

        this.sensor_dev_id = sensor_dev_id;

    }

    public Date getRecord_time() {

        return record_time;

    }

    public void setRecord_time(Date record_time) {

        this.record_time = record_time;

    }

    public float getAirtmp() {

        return airtmp;

    }

    public void setAirtmp(float airtmp) {

        this.airtmp = airtmp;

    }

    public float getAirhum() {

        return airhum;

    }

    public void setAirhum(float airhum) {

        this.airhum = airhum;

    }

    public int getSmoke() {

        return smoke;

    }

    public void setSmoke(int smoke) {

        this.smoke = smoke;

    }

    public int getWater() {

        return water;

    }

    public void setWater(int water) {

        this.water = water;

    }

    public int getLightintensity() {

        return lightintensity;

    }

    public void setLightintensity(int lightintensity) {

        this.lightintensity = lightintensity;

    }

    public int getCO2concentration() {

        return CO2concentration;

    }

    public void setCO2concentration(int cO2concentration) {

        CO2concentration = cO2concentration;

    }

    public int getCOconcentration() {

        return COconcentration;

    }

    public void setCOconcentration(int cOconcentration) {

        COconcentration = cOconcentration;

    }

    public int getCH4concentration() {

        return CH4concentration;

    }

    public void setCH4concentration(int cH4concentration) {

        CH4concentration = cH4concentration;

    }

    public int getO2concentration() {

        return O2concentration;

    }

    public void setO2concentration(int o2concentration) {

        O2concentration = o2concentration;

    }

    public String getNote() {

        return note;

    }

    public void setNote(String note) {

        this.note = note;

    }

    @Override

    public String toString() {

        return "Sensor_hisdata [num=" + num + ", sensor_dev_id="

                + sensor_dev_id + ", record_time=" + record_time + ", airtmp="

                + airtmp + ", airhum=" + airhum + ", smoke=" + smoke

                + ", water=" + water + ", lightintensity=" + lightintensity

                + ", CO2concentration=" + CO2concentration

                + ", COconcentration=" + COconcentration

                + ", CH4concentration=" + CH4concentration

                + ", O2concentration=" + O2concentration + ", note=" + note

                + "]";

    }

	
	
	


}


 sensor/src/com/fgkj/services/Sensor_hisdataService.java

New file
@@ -0,0 +1,32 @@
package com.fgkj.services;



import java.util.List;



import com.fgkj.dao.BaseDAO;

import com.fgkj.dao.BaseDAOFactory;

import com.fgkj.dto.ServiceModel;



public class Sensor_hisdataService {

    private BaseDAO dao;

    private ServiceModel model;

	
    public Sensor_hisdataService() {

        super();

        dao=BaseDAOFactory.getBaseDAO(BaseDAO.SENSOR_HISDATA);

    }

    //根据设备id查询历史记录

    public ServiceModel serchByCondition(Object obj) {

        List list=dao.serchByCondition(obj);

        if(list!=null&&list.size()>0){

            model.setCode(1);

            model.setData(list);

            model.setMsg("查询成功!");

        }else{

            model.setCode(0);

            model.setMsg("查询失败!");

        }

        return model;

    }

	


}


 sensor/src/com/fgkj/services/Sensor_mapinfoService.java

@@ -18,7 +18,7 @@
    

    //查询所有传感器的定位信息

    public ServiceModel searchAll() {

        List list=(List) (dao.searchAll());

        List list=dao.searchAll();

        if(list!=null&&list.size()>0){

            model.setCode(1);

            model.setData(list);