update

whycrzg

2021-02-20 aa885eba07f4b84390922b4b146d1806676293c0

update

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

@@ -34,11 +34,12 @@

    //3.2电池告警历史记录查询
    @PostMapping("byInfo")
    @ApiOperation(notes = "binf.stationName1&binf.stationName 模糊查询 { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"uname\": \"\", \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata_H\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }",value="电池告警历史记录查询")
    @ApiOperation(notes = "binf.stationName1&binf.stationName 模糊查询 { \"binf\": { \"stationName\": \"\", \"stationName1\": \"\", \"battGroupId\": 0 },\"mainf\": { \"num\": 0, \"battGroupId\": 0, \"uname\": \"\", \"fault_level\": 0, \"fault_type_id\": 0, \"record_uid\": 0, \"maint_type_id\": 0, \"maint_done\": 0, \"maint_close\": 0, \"master_audit\": 0, \"appoint_uid\": 0 },\"pageBean\": { \"pageSize\": 10, \"pageNum\": 0 },\"adata_H\": { \"alm_id\": 0, \"alm_signal_id\": 0, \"alm_start_time\": \"2021-01-29 09:40:11\", \"alm_start_time1\": \"2021-01-29 09:40:11\" } }",
            value="电池告警历史记录查询TODO 需要数据待测")
    public ServiceModel serchByInfo(@RequestBody Batt_Maint_Dealarm bmd){
        User_inf uinf=(User_inf) ActionUtil.getUser();
        bmd.setUinf(uinf);
        ServiceModel model=service.serchByInfo(bmd);
        ServiceModel model=service.serchByInfo(bmd);//db_alarm.tb_battalarm_data_history.battgroupid = db_battinf.tb_battinf.battgroupid 缺少数据
        return model;
    }
    

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

@@ -496,7 +496,7 @@
        });
        return list;    
    }*/
    @Select("select count(num) as number,alm_id from db_alarm.tb_battalarm_data  " +
    @Select("select count(num) as num,alm_id from db_alarm.tb_battalarm_data  " +
            "where  alm_cleared_type=0 and tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.battgroupid " +
            " from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
            " where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +