update

whycrzg

2021-02-19 6188cadb42b3f0561ce141d529c753f4af4caf0a

update

 src/main/java/com/fgkj/controller/BattInfController.java

@@ -202,7 +202,7 @@
    }
    //--查询所有的机房
    @PostMapping("allStationName")
    @ApiOperation(notes = "",value="查询所有的机房")
    @ApiOperation(notes = "",value="查询所有的机房—带参")
    public ServiceModel serchAllStationName(@ApiParam(value = "省",required = true) @RequestParam String stationName1,@ApiParam(value = "市",required = true) @RequestParam String stationName2,@ApiParam(value = "区",required = true) @RequestParam String stationName5) {
        BattInf binf = new BattInf();
        User_inf uinf = (User_inf) ActionUtil.getUser();
@@ -496,7 +496,7 @@
    }
    //添加新的电池组
    @PostMapping("ky")
    @ApiOperation(notes = "",value="添加新的电池组")
    @ApiOperation(notes = "TODO",value="添加新的电池组TODO")
    public ServiceModel add_ky(@RequestBody List<BattInf> list) {
        // List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());

@@ -521,10 +521,10 @@
    
    //查询电池组信息<大屏显示>
    @GetMapping("battOnBigScreen")
    @ApiOperation(notes = "",value="查询电池组信息<大屏显示>")
    public ServiceModel serchBatt_DP(@RequestBody BattInf binf){
        // BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
    @ApiOperation(notes = "未使用参数查询",value="查询电池组信息<大屏显示>")
    public ServiceModel serchBatt_DP(){

        BattInf binf= new BattInf();
        return service.serchBatt_DP(binf);
    }
    //紫晶山西——---机房列表

 src/main/java/com/fgkj/controller/BattMap_informationController.java

@@ -101,7 +101,7 @@
    
    //9.1百度地图定位根据省份查询所有该区域的机房
    @GetMapping("byCondition")
    @ApiOperation(notes = "",value="百度地图定位根据省份查询所有该区域的机房")
    @ApiOperation(notes = "模糊查询",value="百度地图定位根据省份查询所有该区域的机房")
    public List serchByCondition(@RequestParam String address) {
        BattMap_information binfo = new BattMap_information();
        binfo.setStationId(address);
@@ -147,7 +147,7 @@
    }
    //9.1首页上查询已经添加物理信息的机房(用户管理的)  包括(告警总数落后总数延迟总数)
    @GetMapping("userManageStation")
    @ApiOperation(notes = "",value="首页上查询已经添加物理信息的机房(用户管理的)  包括(告警总数落后总数延迟总数)")
    @ApiOperation(notes = "code 告警总数；sum 落后总数；newsum 延时总数；msg 61850状态；msgN 设备id",value="首页上查询已经添加物理信息的机房(用户管理的)  包括(告警总数落后总数延迟总数)")
    public List searchUserManageStation() {
        User_inf uinf=(User_inf) ActionUtil.getUser();
        List list = service.searchUserManageStation(uinf);

 src/main/java/com/fgkj/mapper/impl/BattInfMapper.java

@@ -875,7 +875,7 @@
    @Select(" select distinct db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.battgroupname ,db_battinf.tb_battinf.moncount,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.moncapstd," +
            " db_battinf.tb_battinf.battproductdate,db_battinf.tb_battinf.battinusedate,db_battinf.tb_battinf.BattProducer,db_battinf.tb_battinf.BattModel,db_battinf.tb_battinf.MonVolStd " +
            " from db_battinf.tb_battinf " +
            " where  db_battinf.tb_battinf.stationid=#{StationId}")
            " where  db_battinf.tb_battinf.stationid=#{stationId}")
    public List<BattInf> serchByStationid(BattMap_information obj);
    /**
     * 根据机房id查询电池组
@@ -974,17 +974,30 @@
    public List<String> searchDevByStationName3(BattInf obj);
    
    //根据维护区和机房名称查询电池组信息(电池组信息配置)<-------跨域->
    public List searchInform_ky();
    @Select("select  distinct(StationId),StationId_ex,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
            + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
            ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,battGuarantDayCount,SignalId,CInterFaceId,Load_curr,install_user,DisCurrMax,SignalName,Station_install,station_phone  " +
            " From db_battinf.tb_battinf " +
            " order by StationId  ")
    public List<BattInf> searchInform_ky();

    //首页上根据stationid查询电池组的机历卡
    @Select("select * from db_battinf.tb_battinf  where db_battinf.tb_battinf.stationId=#{stationId} order by db_battinf.tb_battinf.battgroupid")
    public List<BattInf> serchBattAllInfoByStationId(BattInf obj);

    //-查询电池组信息<大屏显示>
    public List serchBatt_DP(Object obj);
    @Select(" select DISTINCT StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationId,FBSDeviceId,BattGroupName,battgroupId,monVolStd,monCapStd " +
            "   from db_battinf.tb_battinf  "
            + " ORDER BY StationId asc,battgroupId asc ")
    public List<BattInf> serchBatt_DP(Object obj);
    
    //紫晶山西-机房列表
    public List searchStationList();
    @Select("select  distinct(StationId),StationId_ex,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
            + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
            ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,battGuarantDayCount,SignalId,CInterFaceId,Load_curr,install_user,DisCurrMax,SignalName,Station_install,station_phone  " +
            " From db_battinf.tb_battinf " +
            " order by StationId asc,battgroupId  asc")
    public List<BattInf> searchStationList();
    

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

 src/main/java/com/fgkj/mapper/impl/BattMap_informationMapper.java

@@ -89,7 +89,7 @@

    //9.1百度地图定位根据省份查询所有该区域的机房
    @Select("select num,StationId,StationName,address,longitude,latitude,information from web_site.tb_battmap_information " +
            " where address like '%${address}%'")
            " where address like '%${stationId}%'")
    public List<BattMap_information> serchByCondition(BattMap_information obj) ;
    
    //根据省/市/区县查询所有的站点

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

@@ -1250,6 +1250,7 @@
    }
    //根据维护区和机房名称查询电池组信息(电池组信息配置)<-------跨域----------->
    public ServiceModel searchInform_ky() {
        ServiceModel model = new ServiceModel();
        List<BattInf> list=mapper.searchInform_ky();
        if (list != null && list.size() > 0) {
            model.setCode(1);
@@ -1299,7 +1300,8 @@
    }

    //--------查询电池组信息<大屏显示>
    public ServiceModel serchBatt_DP(Object obj) {
    public ServiceModel serchBatt_DP(BattInf obj) {
        ServiceModel model = new ServiceModel();
        List list=mapper.serchBatt_DP(obj);
        if (list != null && list.size() > 0) {
            model.setCode(1);
@@ -1314,6 +1316,7 @@

    //紫晶山西——---机房列表
    public ServiceModel searchStationList() {
        ServiceModel model = new ServiceModel();
        List list=mapper.searchStationList();
        if (list != null && list.size() > 0) {
            model.setCode(1);

 src/main/java/com/fgkj/services/BattMap_informationService.java

@@ -132,7 +132,7 @@
        if(list!=null&&list.size()>0){
            for(int i=0;i<list.size();i++){
                state="item-normal";
                ServiceModel model=new ServiceModel();
                ServiceModelElectri model=new ServiceModelElectri();
                BattMap_information binformation = list.get(i);
                if(binformation.getFbsDeviceId()/100000==6185){
                    BattInf binf=new BattInf();
@@ -178,13 +178,12 @@
                        }
                    }
                }
                //TODO perry
                // model.setData(list.get(i));
                // model.setCode(numAlarm);        //告警总数
                // model.setSum(numBadBatt);        //落后总数
                // model.setNewsum(numPlan);        //延时总数
                // model.setMsg(state);            //61850状态
                // model.setMsgN(binformation.getFBSDeviceId().toString());
                 model.setData(list.get(i));
                 model.setCode(numAlarm);        //告警总数
                 model.setSum(numBadBatt);        //落后总数
                 model.setNewsum(numPlan);        //延时总数
                 model.setMsg(state);            //61850状态
                 model.setMsgN(binformation.getFbsDeviceId().toString());
                //System.out.println(model);
                listAll.add(model);
            }
@@ -202,11 +201,10 @@
                for(int i=0;i<list.size();i++){
                    ServiceModelElectri model=new ServiceModelElectri();
                    BattMap_information binformation=list.get(i);
                    System.out.println("binformation = " + binformation);
//                    System.out.println("binformation = " + binformation);
                    int numAlarm=battAlarmDataMapper.serchByStationId(binformation);
                    int numBadBatt=badBattMonMapper.serchByStationId(binformation);
                    int numPlan=battDischargePlanMapper.serchByStationId(binformation);
                    //TODO perry
                     model.setData(list.get(i));
                     model.setCode(numAlarm);        //告警总数
                     model.setSum(numBadBatt);        //落后总数
@@ -226,7 +224,6 @@
                BattInf binf = list.get(i);
                ServiceModelElectri model = new ServiceModelElectri();
                model.setCode(binf.getMonCount());//电池组单体个数
                //TODO perry
                model.setNewsum(binf.getBattGroupId());
                model.setMsg(binf.getBattGroupName());//电池组名称
                List<BadBatt_mon> listb = badBattMonMapper.serchMonBad(binf);

 src/main/resources/mapper/BattInfMapper.xml

@@ -4733,8 +4733,8 @@
    <select id="searchMaxdevId_binf_zj" resultType="java.lang.Integer"></select>
<!--    <select id="searchMaxBattgroupId_zj" resultType="java.lang.Integer"></select>-->
<!--    <select id="searchDevByStationName3" resultType="java.util.List"></select>-->
    <select id="searchInform_ky" resultType="java.util.List"></select>
<!--    <select id="searchInform_ky" resultType="java.util.List"></select>-->
<!--    <select id="serchBattAllInfoByStationId" resultType="java.util.List"></select>-->
    <select id="serchBatt_DP" resultType="java.util.List"></select>
    <select id="searchStationList" resultType="java.util.List"></select>
<!--    <select id="serchBatt_DP" resultType="java.util.List"></select>-->
<!--    <select id="searchStationList" resultType="java.util.List"></select>-->
</mapper>