Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

LiJun

2018-11-13 ab25922c19981835d2fefb54e7d4e53e34f14529

Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/src/com/fgkj/actions/BattInfAction.java

@@ -367,6 +367,14 @@
        result = ActionUtil.tojson(model);

        return SUCCESS;

    }

    //首页上根据stationid查询电池组的机历卡

    public String serchBattAllInfoByStationId(){

        BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);

        ServiceModel model = service.serchBattAllInfoByStationId(binf);

        result = ActionUtil.tojson(model);

        return SUCCESS;

    }



    public BattInf getBif() {

        return bif;

    }


 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java

@@ -30,6 +30,7 @@
import com.fgkj.dto.Batt_Maint_Dealarm;

import com.fgkj.dto.Batt_maint_inf;

import com.fgkj.dto.Batt_maintenance_inf;

import com.fgkj.dto.Battinf_ex;

import com.fgkj.dto.Batttestdata;

import com.fgkj.dto.Batttestdata_inf;

import com.fgkj.dto.Batttestdatastop;

@@ -41,6 +42,7 @@
import com.fgkj.dto.User_log;

import com.fgkj.dto.User_task_batt_template;

import com.fgkj.services.User_logService;

import com.sun.org.apache.bcel.internal.generic.LSTORE;



public class BattInfImpl implements BaseDAO, CallBack {

    //添加新的电池组(多个)

@@ -1067,7 +1069,8 @@
            

            public List getResults(ResultSet rs) { List list = new ArrayList();

              try {

                  while (rs.next()) { BattInf batt = new BattInf();

                  while (rs.next()) { 
                      BattInf batt = new BattInf();

                  

                  batt.setNum(Integer.parseInt(rs.getString("num")));

                  

@@ -1164,7 +1167,8 @@
                  int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//剩余保修天数

                  batt.setBattGuarantDayCount(BattGuarantDayCount);

                    

                  list.add(batt); } } catch (SQLException e) { e.printStackTrace(); }

                      list.add(batt); 
                  } } catch (SQLException e) { e.printStackTrace(); }

                  return list; }



        });

@@ -3903,7 +3907,180 @@
        });

        return list;

    }

    //首页上根据stationid查询电池组的机历卡

    public List serchBattAllInfoByStationId(Object obj){

        BattInf binf=(BattInf) obj;

        String sql="select * from db_battinf.tb_battinf,db_battinf.tb_battinf_ex " +

                " where db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +

                " and db_battinf.tb_battinf.stationId=? " +

                " order by db_battinf.tb_battinf.battgroupid";

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

    

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()){

                          BattInf batt = new BattInf();

						  
                          batt.setStationId((rs.getString("StationId")));

						  
                          batt.setStationName(rs.getString("StationName"));

						  
                          batt.setStationName1(rs.getString("StationName1"));

						  
                          batt.setStationName2(rs.getString("StationName2"));

						  
                          batt.setStationName3(rs.getString("StationName3"));

						  
                          batt.setStationName4(rs.getString("StationName4"));

						  
                          batt.setStationName5(rs.getString("StationName5"));

						  
                          batt.setStationName6(rs.getString("StationName6"));

						  
                          batt.setStationName7(rs.getString("StationName7"));

						  
                          batt.setStationName8(rs.getString("StationName8"));

						  
                          batt.setStationName9(rs.getString("StationName9"));

						  
                          batt.setStationIp(rs.getString("StationIp"));

						  
                          batt.setFBSDeviceId(Integer.parseInt(rs.getString("FBSDeviceId")));

						  
                          batt.setFbsDeviceIp(rs.getString("FbsDeviceIp"));

						  
                          batt.setFBSDeviceName(rs.getString("FBSDeviceName"));

						  
                          batt.setGroupIndexInFBSDevice(Integer.parseInt(rs.getString(

                          "GroupIndexInFBSDevice")));

						  
                          batt.setBattModel(rs.getString("BattModel"));

						  
                          batt.setBattGroupId(Integer.parseInt(rs.getString("BattGroupId")));

						  
                          batt.setBattGroupNum(Integer.parseInt(rs.getString("BattGroupNum")));

						  
                          batt.setBattGroupName(rs.getString("BattGroupName"));

						  
                          batt.setBattGroupName1(rs.getString("BattGroupName1"));

						 
                          batt.setBattGroupName2(rs.getString("BattGroupName2"));

						  
                          batt.setBattGroupName3(rs.getString("BattGroupName3"));

						  
                          batt.setBattGroupName4(rs.getString("BattGroupName4"));

						  
                          batt.setBattGroupName5(rs.getString("BattGroupName5"));

						  
                          batt.setBattGroupName6(rs.getString("BattGroupName6"));

						  
                          batt.setFloatVolLevel(Float.parseFloat(rs.getString("FloatVolLevel")));

						  
                          batt.setOfflineVolLevel(Float.parseFloat(rs.getString("OfflineVolLevel"))) ;

						 
                          batt.setBattFloatCurrent(Float.parseFloat(rs.getString("BattFloatCurrent")));

						  
                          batt.setDeviceId(rs.getString("DeviceId"));

						  
                          batt.setDeviceName(rs.getString("DeviceName"));

						  
                          batt.setMonCount(Integer.parseInt(rs.getString("MonCount")));

						  
                          batt.setMonCapStd(Float.parseFloat(rs.getString("MonCapStd")));

						  
                          batt.setMonResStd(Float.parseFloat(rs.getString("MonResStd")));

						 
                          batt.setMonSerStd(Float.parseFloat(rs.getString("MonSerStd")));

						  
                          batt.setMonTmpStd(Float.parseFloat(rs.getString("MonTmpStd")));

						  
                          batt.setMonVolStd(Float.parseFloat(rs.getString("MonVolStd")));

						  
                          batt.setMonVolLowToAvg(Float.parseFloat(rs.getString("MonVolLowToAvg")));

						  
                          batt.setMonNum(Integer.parseInt(rs.getString("MonNum")));

						  
                          batt.setBattProducer(rs.getString("BattProducer"));

						  
                          batt.setBattProductDate((Date) rs.getObject("BattProductDate"));

						  
                          batt.setBattInUseDate((Date) rs.getObject("BattInUseDate"));

						  
                          batt.setSignalId(rs.getString("SignalId"));

						  
                          batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));

						  
                          batt.setSignalName(rs.getString("SignalName"));

                          int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//剩余保修天数

                          batt.setBattGuarantDayCount(BattGuarantDayCount);

						  
                          Battinf_ex binf_ex=new Battinf_ex();

                            binf_ex.setStationId(rs.getString("stationId"));

                            binf_ex.setFBSDeviceId(rs.getInt("fBSDeviceId"));

                            binf_ex.setStationName(rs.getString("stationName"));

                            binf_ex.setStationCode(rs.getString("stationCode"));

                            binf_ex.setStationRegion(rs.getString("stationRegion"));

                            binf_ex.setKeyWords(rs.getString("keyWords"));

                            binf_ex.setAffiliation(rs.getString("affiliation"));

                            binf_ex.setDataSources(rs.getString("dataSources"));

                            binf_ex.setStationType(rs.getString("stationType"));

                            binf_ex.setLongitude(rs.getDouble("longitude"));

                            binf_ex.setLatitude(rs.getInt("latitude"));

                            binf_ex.setStationAddr(rs.getString("stationAddr"));

                            binf_ex.setStationLevel(rs.getString("stationLevel"));

                            binf_ex.setMaintenanceState(rs.getString("maintenanceState"));

                            binf_ex.setBlockedState(rs.getString("blockedState"));

                            binf_ex.setMaintenanceCompany(rs.getString("maintenanceCompany"));

                            binf_ex.setBusinessScenario(rs.getString("businessScenario"));

                            binf_ex.setCoverScenario(rs.getString("coverScenario"));

                            binf_ex.setSiteTerrain(rs.getString("siteTerrain"));

                            binf_ex.setPropertyRights(rs.getString("propertyRights"));

                            binf_ex.setPropertyUnit(rs.getString("propertyUnit"));

                            binf_ex.setIsShare(rs.getString("isShare"));

                            binf_ex.setUseUnit(rs.getString("useUnit"));

                            binf_ex.setSiteCode(rs.getString("siteCode"));

                            binf_ex.setHistorySiteCode(rs.getString("historySiteCode"));

                            binf_ex.setSiteInternalNumber(rs.getString("siteInternalNumber"));

                            binf_ex.setSitePinyinReferred(rs.getString("sitePinyinReferred"));

                            binf_ex.setSiteChineseReferred(rs.getString("siteChineseReferred"));

                            binf_ex.setSiteMergeRecord(rs.getString("siteMergeRecord"));

                            binf_ex.setIsOpenBusiness(rs.getString("isOpenBusiness"));

                            binf_ex.setSchoolPersonnel(rs.getString("schoolPersonnel"));

                            binf_ex.setEntryTime(rs.getString("entryTime"));

                            binf_ex.setModifyPeople(rs.getString("modifyPeople"));

                            binf_ex.setModifyTime(rs.getString("modifyTime"));

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

                            binf_ex.setSiteReceivesMark(rs.getString("siteReceivesMark"));

                            binf_ex.setSiteValidity(rs.getString("siteValidity"));

                            binf_ex.setSiteNameCMCC(rs.getString("siteNameCMCC"));

                            binf_ex.setSiteNameCUCC(rs.getString("siteNameCUCC"));

                            binf_ex.setSiteNameCTC(rs.getString("siteNameCTC"));

                            binf_ex.setProducer(rs.getString("producer"));

                            binf_ex.setLastTimeLong(rs.getDouble("lastTimeLong"));

                            binf_ex.setLastTimeType(rs.getString("lastTimeType"));

                            binf_ex.setLastTimeDate(rs.getTimestamp("lastTimeDate"));

                            binf_ex.setShareInfo(rs.getString("shareInfo"));

                            binf_ex.setElectPowerCMCC(rs.getInt("electPowerCMCC"));

                            binf_ex.setElectPowerCUCC(rs.getInt("electPowerCUCC"));

                            binf_ex.setElectPowerCTC(rs.getInt("electPowerCTC"));

                            binf_ex.setIsCanElectPower(rs.getInt("isCanElectPower"));

                            binf_ex.setUpperStationRoute(rs.getDouble("upperStationRoute"));

                            binf_ex.setUpperStationDifficult(rs.getString("upperStationDifficult"));

                            binf_ex.setClienteleErrorService(rs.getString("clienteleErrorService"));

							
                            batt.setBinf_ex(binf_ex);

                            list.add(batt); 
                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        });

        return list;

    }

    

    public static void main(String[] args) throws ParseException {

        //new BattInfImpl().searchAll();

@@ -3918,6 +4095,7 @@
        binf.setStationName3("");

        binf.setBattGroupName("");

        binf.setBattProducer("1");

        binf.setStationId("42000002");

        User_inf uinf=new User_inf();

        uinf.setUId(1002);

        

@@ -3945,10 +4123,11 @@
        //List<BattInf> list=biml.serchMakeGroup(binf);

        //List<BattInf> list=biml.serchGroupByInfor(binf);

        //List<BattInf> list=biml.searchInform1(bmd);

        List<BattInf> list=biml.serchStationName5(binf);

        /*for (BattInf b : list) {

        //<BattInf> list=biml.serchStationName5(binf);

        List<BattInf> list=biml.serchBattAllInfoByStationId(binf);

        for (BattInf b : list) {

            System.out.println(b);

        }*/

        }

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

    }

    


 gx_tieta/src/com/fgkj/dto/BattInf.java

@@ -80,6 +80,9 @@
    private Page page;

    private Object obj;

    private String station_phone;

	
    private Battinf_ex binf_ex;

	
    public BattInf() {

        super();

    }

@@ -534,6 +537,12 @@
    public void setStation_install(Integer station_install) {

        Station_install = station_install;

    }

    public Battinf_ex getBinf_ex() {

        return binf_ex;

    }

    public void setBinf_ex(Battinf_ex binf_ex) {

        this.binf_ex = binf_ex;

    }

    @Override

    public String toString() {

        return "BattInf [num=" + num + ", StationId=" + StationId

@@ -575,6 +584,7 @@
                + ", SignalName=" + SignalName + ", StartNum=" + StartNum

                + ", Station_install=" + Station_install + ", Size=" + Size

                + ", page=" + page + ", obj=" + obj + ", station_phone="

                + station_phone + "]";

                + station_phone + ", binf_ex=" + binf_ex + "]";

    }

	
}


 gx_tieta/src/com/fgkj/services/BattInfServices.java

@@ -942,6 +942,19 @@
        return model;

    }



    //首页上根据stationid查询电池组的机历卡

    public ServiceModel serchBattAllInfoByStationId(Object obj){

        List list=((BattInfImpl)dao).serchBattAllInfoByStationId(obj);

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

            model.setCode(1);

            model.setData(list);

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

        }else{

            model.setCode(0);

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

        }

        return model;

    }

    public static void main(String[] args) {

        //new BattInfServices().findMenu();

        BattInf b=new BattInf();