hdw
2018-12-24 2d05296d36e200eb66711057f4997872efab46d1
Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
7个文件已修改
61 ■■■■ 已修改文件
gx_tieta/.classpath 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Bts_station_stateAction.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Bts_station_stateService.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/.classpath
@@ -44,7 +44,6 @@
    <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsf-api.jar"/>
    <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsf-impl.jar"/>
    <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jacob.jar"/>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    <classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.generic_5.0">
        <attributes>
            <attribute name="owner.project.facets" value="jst.web"/>
@@ -62,5 +61,6 @@
            <attribute name="owner.project.facets" value="jst.jsf"/>
        </attributes>
    </classpathentry>
    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    <classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
</classpath>
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Bts_station_stateAction.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Bts_station_stateService.class
Binary files differ
gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
@@ -41,8 +41,13 @@
        result = tojson(model);              
        return SUCCESS;
    }
  //查询设备SD卡的实时状态
    public String serchSDCard(){
        BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
        ServiceModel model = service.serchSDCard(binf);
        result=tojson(model);
        return SUCCESS;
    }
    
    
    
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -301,6 +301,40 @@
        }
        return nums;
    }
    //查询设备SD卡的实时状态
    public int serchSDCard(Object obj) {
        BattInf binf=(BattInf) obj;
        String sql=" select distinct station_stat from  db_ram_db.tb_bts_station_state where station_id=? ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[] {binf.getStationId()} , new CallBack() {
            @Override
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                try {
                    while(rs.next()) {
                        int station_stat=rs.getInt("station_stat");
                        if((station_stat&1024)>1) {
                            list.add(1);
                        }else {
                            list.add(0);
                        }
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                return list;
            }
        });
        int station_stat=1;
        if(list!=null&&list.size()>0) {
            station_stat=(int) list.get(list.size()-1);
        }
        return station_stat;
    }
    public List serchByInfo(Object obj) {
        // TODO Auto-generated method stub
        return null;
@@ -313,7 +347,7 @@
        binf.setStationName2("");
        binf.setStationName3("");
        binf.setStationName5("");
        binf.setStationId("");
        binf.setStationId("42000603");
        binf.setBattGroupNum(62);
        User_inf uinf=new User_inf();
        uinf.setUId(1002);
@@ -331,12 +365,12 @@
        /*BattMap_information bm=new BattMap_information();
        bm.setStationId("42000570");
        int nums=bimpl.serchByStationId(bm);*/
        int nums=bimpl.serchByState_diaozhan(uinf);
        //int nums=bimpl.serchByState_diaozhan(uinf);
        /*BattMap_information bm=new BattMap_information();
        bm.setStationId("42000366");
        int nums=bimpl.serchByStationId_diaozhan(bm);*/
        System.out.println(nums);
        int station_state=bimpl.serchSDCard(binf);
        System.out.println(station_state);
    }
    
gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java
@@ -6,7 +6,6 @@
import com.fgkj.dao.BaseDAOFactory;
import com.fgkj.dao.impl.BadBatt_monImpl;
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.BattPower_offImpl;
import com.fgkj.dao.impl.Batt_enduranceImpl;
import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
@@ -67,5 +66,10 @@
        model.setMsgT(String.valueOf(xuhangnums));//存在续航不足3小时的机房个数
        return model;
    }
    //查询设备SD卡的实时状态
    public ServiceModel serchSDCard(Object obj) {
        int station_state=((Bts_station_stateImpl)dao).serchSDCard(obj);
        model.setData(station_state);
        return model;
    }
}