删除弃用的方法

smart-city-platform/src/main/java/com/bz/smart_city/controller/water/WaterMeterReadController.java

@@ -148,79 +148,7 @@ public class WaterMeterReadController {
 		return new AjaxMessage<>(ResultStatus.OK, rtnList);
 	}
 
-	@Deprecated
-//	@ResponseBody
-//    @GetMapping("/query/rate/{building}/")
-//    @ApiOperation(value = "抄表率查询")
-	public AjaxMessage<Pagination<MeterReadRate>> queryMeterReadRate(
-			@ApiParam(value = "建筑,0表示所有", required = true, defaultValue = "0") @PathVariable(required = true) int building,
-			@ApiParam(value = "开始日期", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束日期", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "页数,默认第一页", required = true, defaultValue = "1") @RequestParam(required = true, defaultValue = "1") int pageNum,
-			@ApiParam(value = "条数，默认15条", required = true, defaultValue = "15") @RequestParam(required = true, defaultValue = "15") int pageSize) {
-		log.info("开始抄表率查询");
-		// 1,获取用户的站点信息
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		Integer siteId = 0;
-		if (loginUser != null && loginUser.getIsSuperAdmin() != 1) {
-			siteId = loginUser.getSiteId();
-		}
-		MeterReadRate param = new MeterReadRate();
-		param.setSiteId(siteId);
-		param.setBuildingId(building);
-		param.setStartDate(startDate);
-		param.setEndDate(endDate);
-		param.setBeginRate(beginRate);
-		param.setEndRate(endRate);
-
-		Pagination<MeterReadRate> result = meterReadRecordService.queryMeterReadRate(param, pageNum, pageSize);
-		log.info("结束抄表率查询");
-		return new AjaxMessage<>(ResultStatus.OK, result);
-	}
 
-	@Deprecated
-//	@ResponseBody
-//    @GetMapping("/query/rate/summary/{channelId}/{building}/{period}/")
-//    @ApiOperation(value = "抄表率汇总")
-	public AjaxMessage<MeterReadRate> summaryMeterReadRate(
-			@ApiParam(value = "场景,0表示所有", required = true) @PathVariable int channelId,
-			@ApiParam(value = "建筑,0表示所有", required = true) @PathVariable int building,
-			@ApiParam(value = "统计周期:0 表示自定义，1表示今天，2表示昨天，7表示近7天，30表示近30天", required = true) @PathVariable int period,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "自定义开始日期", required = false) @RequestParam(required = false, defaultValue = "0") int startDate,
-			@ApiParam(value = "自定义结束日期", required = false) @RequestParam(required = false, defaultValue = "0") int endDate) {
-		log.info("开始抄表率汇总信息查询");
-		// 1,获取用户的站点信息
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setChannelId(channelId);
-		condition.setSiteId(loginUser.getSiteId());
-		condition.setBuildingId(building);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		condition.setProgramItems(programItems);
-		condition.setPeriod(period);
-
-//        MeterReadRate param = new MeterReadRate();
-//        param.setSiteId(loginUser.getSiteId());
-//        param.setBuildingId(building);
-//        param.setStartDate(startDate);
-//        param.setEndDate(endDate);
-//        param.setPeriod(period);
-//        param.setBeginRate(beginRate);
-//        param.setEndRate(endRate);
-//        
-		MeterReadRate result = meterReadRecordService.summaryMeterReadRate(condition);
-		log.info("结束抄表率汇总信息查询");
-		return new AjaxMessage<>(ResultStatus.OK, result);
-	}
 
 	@ResponseBody
 	@GetMapping("/analysis/rate/{channelId}/{building}/{period}/")
@@ -309,34 +237,7 @@ public class WaterMeterReadController {
 		log.info("结束抄表记录导出");
 	}
 
-	@Deprecated
-//    @GetMapping("/getMeterReadRateExcel")
-//    @ApiOperation(value = "抄表率导出")
-	public void getMeterReadRateExcel(
-			@ApiParam(value = "建筑,0表示所有", required = true, defaultValue = "0") @RequestParam(required = true) int building,
-			@ApiParam(value = "开始日期", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束日期", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "token", required = true) @RequestParam(required = true) String token,
-			HttpServletResponse httpServletResponse) {
-		log.info("开始抄表率导出excel");
-		// 1,获取用户的站点信息
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		Integer siteId = 0;
-		if (loginUser != null && loginUser.getIsSuperAdmin() != 1) {
-			siteId = loginUser.getSiteId();
-		}
-		MeterReadRate param = new MeterReadRate();
-		param.setSiteId(siteId);
-		param.setBuildingId(building);
-		param.setStartDate(startDate);
-		param.setEndDate(endDate);
-		param.setBeginRate(beginRate);
-		param.setEndRate(endRate);
-		meterReadRecordService.getMeterReadRateExcel(param, httpServletResponse);
-		log.info("结束抄表率导出excel");
-	}
+
 
 	/************************************************
 	 * 按照建筑统计抄表率
@@ -486,49 +387,6 @@ public class WaterMeterReadController {
 				pageNum, pageSize);
 		return new AjaxMessage<>(ResultStatus.OK, rtnList);
 	}
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/getRateListByBuilding")
-//    @ApiOperation(value = "场景下抄表率-按照建筑统计抄表率-适用于所有场景")
-	public AjaxMessage<Pagination<StatMeterReadRateDto>> getRateListByBuilding(
-			@ApiParam(value = "场景", required = true) @RequestParam(required = true) int channelId,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = false) @RequestParam(required = false) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = false) @RequestParam(required = false) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer communityId,
-			@ApiParam(value = "建筑", required = false) @RequestParam(required = false) Integer buildingId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "页数，默认第一页", required = true, defaultValue = "1") @RequestParam(required = true, defaultValue = "1") int pageNum,
-			@ApiParam(value = "条数，默认15条", required = true, defaultValue = "15") @RequestParam(required = true, defaultValue = "15") int pageSize) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setChannelId(channelId);
-		condition.setCommunityId(communityId);
-		condition.setBuildingId(buildingId);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-		Pagination<StatMeterReadRateDto> rtnList = statMeterReadRateByBuildingService.getRateListByBuilding(condition,
-				pageNum, pageSize);
-		return new AjaxMessage<>(ResultStatus.OK, rtnList);
-	}
 
 	@ResponseBody
 	@GetMapping("/v2/summaryRateListByBuildingForNew")
@@ -598,46 +456,6 @@ public class WaterMeterReadController {
 		return new AjaxMessage<>(ResultStatus.OK, resp);
 	}
 
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/summaryRateListByBuilding")
-//    @ApiOperation(value = "场景下抄表率-按照建筑汇总-适用于所有场景")
-	public AjaxMessage<StatMeterReadRateDto> summaryRateListByBuilding(
-			@ApiParam(value = "场景", required = true) @RequestParam(required = true) int channelId,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer communityId,
-			@ApiParam(value = "建筑", required = false) @RequestParam(required = false) Integer buildingId,
-			@Deprecated @ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@Deprecated @ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setChannelId(channelId);
-		condition.setCommunityId(communityId);
-		condition.setBuildingId(buildingId);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-		StatMeterReadRateDto resp = statMeterReadRateByBuildingService.summaryRateListByBuilding(condition);
-		return new AjaxMessage<>(ResultStatus.OK, resp);
-	}
 
 	@ResponseBody
 	@GetMapping("/v2/exportRateListByBuilding")
@@ -700,47 +518,7 @@ public class WaterMeterReadController {
 		condition.setPeriod(period);
 		statMeterReadRateByBuildingService.exportRateListByBuildingForNew(condition, httpServletResponse);
 	}
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/exportRateListByBuilding")
-//    @ApiOperation(value = "场景下抄表率-按照建筑导出-适用于所有场景")
-	public void exportRateListByBuilding(
-			@ApiParam(value = "场景", required = true) @RequestParam(required = true) int channelId,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer communityId,
-			@ApiParam(value = "建筑", required = false) @RequestParam(required = false) Integer buildingId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "token", required = true) @RequestParam(required = true) String token,
-			HttpServletResponse httpServletResponse) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
 
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setChannelId(channelId);
-		condition.setCommunityId(communityId);
-		condition.setBuildingId(buildingId);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-		statMeterReadRateByBuildingService.exportRateListByBuilding(condition, httpServletResponse);
-	}
 
 	/************************************************
 	 * 按照集中器统计抄表率
@@ -789,104 +567,10 @@ public class WaterMeterReadController {
 		return new AjaxMessage<>(ResultStatus.OK, rtnList);
 	}
 
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/getRateListByConcentrator")
-//    @ApiOperation(value = "抄表率明细-按照集中器统计抄表率-适用于无线远传表")
-	public AjaxMessage<Pagination<StatMeterReadRateDto>> getRateListByConcentrator(
-			@ApiParam(value = "表类型,WXYC:无线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "页数，默认第一页", required = true, defaultValue = "1") @RequestParam(required = true, defaultValue = "1") int pageNum,
-			@ApiParam(value = "条数，默认15条", required = true, defaultValue = "15") @RequestParam(required = true, defaultValue = "15") int pageSize) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-//    	Integer isAdmin = loginUser.getType(); // 1 超级管理员
-//		List<ProgramItem> programItems = newArrayList();
-//		if (loginUser.getSiteList() != null) {
-//			loginUser.getSiteList().forEach(site -> {
-//	            List<ProgramItem> programItemsTem = loginUser.getDataPermissionMap().get(site.getId());
-//	            if (programItemsTem != null) {
-//	                programItems.addAll(programItemsTem);
-//	            }
-//	        });
-//		}
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-//        condition.setSites(loginUser.getSiteList());
-//        condition.setIsAdmin(isAdmin);
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		Pagination<StatMeterReadRateDto> rtnList = null;
-		if (condition.getDeviceTypeCode().equals("WXYC")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				rtnList = statMeterReadRateByConcentratorService.getRateListByConcentrator(condition, pageNum,
-						pageSize);
-			}
-		}
-
-		return new AjaxMessage<>(ResultStatus.OK, rtnList);
-	}
-
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/summaryRateListByConcentrator")
-//    @ApiOperation(value = "抄表率明细-按照集中器汇总-适用于无线远传表")
-	public AjaxMessage<StatMeterReadRateDto> summaryRateListByConcentrator(
-			@ApiParam(value = "表类型,WXYC:无线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		StatMeterReadRateDto resp = null;
-		if (condition.getDeviceTypeCode().equals("WXYC")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				resp = statMeterReadRateByConcentratorService.summaryRateListByConcentrator(condition);
-			}
-		}
 
-		return new AjaxMessage<>(ResultStatus.OK, resp);
-	}
-
-	  @ResponseBody
-	  @GetMapping("/summaryRateListByConcentrator")
-	  @ApiOperation(value = "抄表率明细-按照集中器汇总-适用于无线远传表")
+	@ResponseBody
+	@GetMapping("/summaryRateListByConcentrator")
+	@ApiOperation(value = "抄表率明细-按照集中器汇总-适用于无线远传表")
 	public AjaxMessage<StatMeterReadRateDto> summaryRateListByConcentrator(
 			@ApiParam(value = "表类型,WXYC:无线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
 			@ApiParam(value = "查询范围，2:昨天，7:近7日，15:近15日", required = true) @RequestParam(required = true) Integer period,
@@ -920,6 +604,7 @@ public class WaterMeterReadController {
 
 		return new AjaxMessage<>(ResultStatus.OK, resp);
 	}
+
 	@ResponseBody
 	@GetMapping("/exportRateListByConcentrator")
 	@ApiOperation(value = "抄表率明细-按照集中器导出-适用于无线远传表")
@@ -957,95 +642,6 @@ public class WaterMeterReadController {
 		}
 	}
 
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/exportRateListByConcentrator")
-//    @ApiOperation(value = "抄表率明细-按照集中器导出-适用于无线远传表")
-	public void exportRateListByConcentrator(
-			@ApiParam(value = "表类型,WXYC:无线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "token", required = true) @RequestParam(required = true) String token,
-			HttpServletResponse httpServletResponse) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (condition.getDeviceTypeCode().equals("WXYC")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				statMeterReadRateByConcentratorService.exportRateListByConcentrator(condition, httpServletResponse);
-			}
-		}
-	}
-
-	/************************************************
-	 * 按照采集器统计抄表率
-	 *****************************************************/
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/getRateListByCollector")
-//    @ApiOperation(value = "抄表率明细-按照采集器统计抄表率-适用于有线远传、预付费、光电直读表")
-	public AjaxMessage<Pagination<StatMeterReadRateDto>> getRateListByCollector(
-			@ApiParam(value = "表类型, YFFJK:预付费,GDZD:光电直读,YXYC:有线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "页数，默认第一页", required = true, defaultValue = "1") @RequestParam(required = true, defaultValue = "1") int pageNum,
-			@ApiParam(value = "条数，默认15条", required = true, defaultValue = "15") @RequestParam(required = true, defaultValue = "15") int pageSize) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-		Pagination<StatMeterReadRateDto> rtnList = null;
-		if (condition.getDeviceTypeCode().equals("YFFJK") || condition.getDeviceTypeCode().equals("GDZD")
-				|| condition.getDeviceTypeCode().equals("YXYC")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				// 2,判断是否需要查询近7天的数据
-				rtnList = statMeterReadRateByCollectorService.getRateListByCollector(condition, pageNum, pageSize);
-			}
-		}
-		return new AjaxMessage<>(ResultStatus.OK, rtnList);
-	}
 
 	@ResponseBody
 	@GetMapping("/getRateListByCollector")
@@ -1095,51 +691,6 @@ public class WaterMeterReadController {
 		return new AjaxMessage<>(ResultStatus.OK, rtnList);
 	}
 
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/summaryRateListByCollector")
-//    @ApiOperation(value = "抄表率明细-按照采集器汇总-适用于有线远传、预付费、光电直读表")
-	public AjaxMessage<StatMeterReadRateDto> summaryRateListByCollector(
-			@ApiParam(value = "表类型, YFFJK:预付费,GDZD:光电直读,YXYC:有线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-
-		StatMeterReadRateDto resp = null;
-		if (condition.getDeviceTypeCode().equals("YFFJK") || condition.getDeviceTypeCode().equals("GDZD")
-				|| condition.getDeviceTypeCode().equals("YXYC")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				// 2,判断是否需要查询近7天的数据
-				resp = statMeterReadRateByCollectorService.summaryRateListByCollector(condition);
-			}
-		}
-		return new AjaxMessage<>(ResultStatus.OK, resp);
-	}
 
 	@ResponseBody
 	@GetMapping("/summaryRateListByCollector")
@@ -1227,109 +778,6 @@ public class WaterMeterReadController {
 		}
 	}
 
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/exportRateListByCollector")
-//    @ApiOperation(value = "抄表率明细-按照采集器导出-适用于有线远传、预付费、光电直读表")
-	public void exportRateListByCollector(
-			@ApiParam(value = "表类型, YFFJK:预付费,GDZD:光电直读,YXYC:有线远传", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String concentratorCode,
-			@ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorCode,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "token", required = true) @RequestParam(required = true) String token,
-			HttpServletResponse httpServletResponse) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-
-		if (condition.getDeviceTypeCode().equals("YFFJK") || condition.getDeviceTypeCode().equals("GDZD")
-				|| condition.getDeviceTypeCode().equals("YXYC")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				// 2,判断是否需要查询近7天的数据
-				statMeterReadRateByCollectorService.exportRateListByCollector(condition, httpServletResponse);
-			}
-		}
-	}
-
-	/************************************************
-	 * 按照小区统计抄表率
-	 *****************************************************/
-
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/getRateListByCommunity")
-//    @ApiOperation(value = "抄表率明细-按照小区统计抄表率-适用于LoraWAN、NB-IOT表")
-	public AjaxMessage<Pagination<StatMeterReadRateDto>> getRateListByCommunity(
-			@ApiParam(value = "表类型, LORAWM:水表,NBWM:NB-IOT水表", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer communityId,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "页数，默认第一页", required = true, defaultValue = "1") @RequestParam(required = true, defaultValue = "1") int pageNum,
-			@ApiParam(value = "条数，默认15条", required = true, defaultValue = "15") @RequestParam(required = true, defaultValue = "15") int pageSize) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-//    	Integer isAdmin = loginUser.getType(); // 1 超级管理员
-//		List<ProgramItem> programItems = newArrayList();
-//		if (loginUser.getSiteList() != null) {
-//			loginUser.getSiteList().forEach(site -> {
-//	            List<ProgramItem> programItemsTem = loginUser.getDataPermissionMap().get(site.getId());
-//	            if (programItemsTem != null) {
-//	                programItems.addAll(programItemsTem);
-//	            }
-//	        });
-//		}
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-//        condition.setSites(loginUser.getSiteList());
-//        condition.setIsAdmin(isAdmin);
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		condition.setCommunityId(communityId);
-
-		Pagination<StatMeterReadRateDto> rtnList = null;
-		if (condition.getDeviceTypeCode().equals("LORAWM") || condition.getDeviceTypeCode().equals("NBWM")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				rtnList = statMeterReadRateByCommunityService.getRateListByCommunity(condition, pageNum, pageSize);
-			}
-
-		}
-		return new AjaxMessage<>(ResultStatus.OK, rtnList);
-	}
-
 	@ResponseBody
 	@GetMapping("/getRateListByCommunity")
 	@ApiOperation(value = "抄表率明细-按照小区统计抄表率-适用于LoraWAN、NB-IOT表")
@@ -1410,45 +858,6 @@ public class WaterMeterReadController {
 		return new AjaxMessage<>(ResultStatus.OK, resp);
 	}
 
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/summaryRateListByCommunity")
-//    @ApiOperation(value = "抄表率明细-按照小区统计汇总-适用于LoraWAN、NB-IOT表")
-	public AjaxMessage<StatMeterReadRateDto> summaryRateListByCommunity(
-			@ApiParam(value = "表类型, LORAWM:水表,NBWM:NB-IOT水表", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer communityId,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		condition.setCommunityId(communityId);
-
-		StatMeterReadRateDto resp = null;
-		if (condition.getDeviceTypeCode().equals("LORAWM") || condition.getDeviceTypeCode().equals("NBWM")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				resp = statMeterReadRateByCommunityService.summaryRateListByCommunity(condition);
-			}
-
-		}
-		return new AjaxMessage<>(ResultStatus.OK, resp);
-	}
-
 	@ResponseBody
 	@GetMapping("/exportRateListByCommunity")
 	@ApiOperation(value = "抄表率明细-按照小区导出-适用于LoraWAN、NB-IOT表")
@@ -1484,79 +893,6 @@ public class WaterMeterReadController {
 			}
 
 		}
-	}
-
-	@Deprecated
-//    @ResponseBody
-//    @GetMapping("/exportRateListByCommunity")
-//    @ApiOperation(value = "抄表率明细-按照小区导出-适用于LoraWAN、NB-IOT表")
-	public void exportRateListByCommunity(
-			@ApiParam(value = "表类型, LORAWM:水表,NBWM:NB-IOT水表", required = true) @RequestParam(required = true) String deviceTypeCode,
-			@ApiParam(value = "开始时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束时间,格式YYYYMMDD", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer customerId,
-			@ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer communityId,
-			@ApiParam(value = "抄表率范围(起)", required = false) @RequestParam(required = false) Double beginRate,
-			@ApiParam(value = "抄表率范围(止)", required = false) @RequestParam(required = false) Double endRate,
-			@ApiParam(value = "token", required = true) @RequestParam(required = true) String token,
-			HttpServletResponse httpServletResponse) {
-		LoginUser loginUser = UserUtil.getCurrentUser();
 
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-		// 1,设置数据权限
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSiteId(loginUser.getSiteId());
-		// 2,设置其他查询条件
-		condition.setDeviceTypeCode(deviceTypeCode);
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setCustormerId(customerId);
-		condition.setBeginRate(beginRate);
-		condition.setEndRate(endRate);
-		condition.setCommunityId(communityId);
-
-		if (condition.getDeviceTypeCode().equals("LORAWM") || condition.getDeviceTypeCode().equals("NBWM")) {
-			WMeterType type = waterTypeMapper.getWMeterTypeByDeviceTypeCode(condition.getDeviceTypeCode());
-			if (type != null && type.getDeviceTypeId() != null) {
-				condition.setDeviceTypeId(type.getDeviceTypeId());
-				statMeterReadRateByCommunityService.exportRateListByCommunity(condition, httpServletResponse);
-			}
-
-		}
-	}
-
-
-	@ResponseBody
-	@PostMapping("getMeterReadData")
-	@ApiOperation(value = "获取建筑的每月抄表统计(提供给抄表与营收系统用)")
-	public List<MeterReadData> getMeterReadData(
-			//@ApiParam(value = "data", required = true) @RequestBody InputMeterReadDate data,
-			@ApiParam(value = "建筑id", required = true) @RequestParam Integer buildingId,
-			@ApiParam(value = "时间,格式YYYYMM", required = true) @RequestParam Integer startDate
-	) {
-		List<MeterReadData> list = deviceDataDimService.getMeterReadData(buildingId, startDate);
-		return list;
-	}
-
-	@ResponseBody
-	@PostMapping("getPeriodMeterReadData")
-	@ApiOperation(value = "获取某段期间筑建的抄表记录(提供给抄表与营收系统用)")
-	public List<MeterReadData> getPeriodMeterReadData(
-			@ApiParam(value = "建筑id", required = true) @RequestParam Integer buildingId,
-			@ApiParam(value = "时间,格式YYYYMMDD", required = true) @RequestParam Integer startDate
-	) {
-		List<MeterReadData> list = deviceDataDimService.getPeriodMeterReadData(buildingId, startDate);
-		return list;
-	}
-
-	@ResponseBody
-	@PostMapping("getDeviceCustomerInfo")
-	@ApiOperation(value = "获取建筑的设备客户信息(提供给抄表与营收系统用)")
-	public List<DeviceCustomerInfo> getDeviceCustomerInfo(
-			@ApiParam(value = "建筑id", required = true) @RequestParam Integer buildingId
-	) {
-		List<DeviceCustomerInfo> list = deviceService.getDeviceCustomerInfo(buildingId);
-		return list;
 	}
 }

smart-city-platform/src/main/java/com/bz/smart_city/dao/DeviceDataDimMapper.java

@@ -25,10 +25,7 @@ public interface DeviceDataDimMapper {
 
     List<DeviceDataDim> getDeviceDataBetweenDate(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("deviceId") Long deviceId);
 
-    List<MeterReadData> getMeterReadData(@Param("buildingId") Integer buildingId, @Param("startDate") Integer startDate);
 
-    List<MeterReadData> getPeriodMeterReadData(@Param("buildingId") Integer buildingId, @Param("startDate") Integer startDate);
-    
     int updateChannel(@Param("sysId") Integer system,@Param("deviceId") Long deviceId);
     
     DeviceDataDim queryMeterLastData(@Param("deviceId") Long deviceId);

smart-city-platform/src/main/java/com/bz/smart_city/dao/DeviceMapper.java

@@ -113,7 +113,6 @@ public interface DeviceMapper {
      */
     List<DeviceDto> queryDeviceByClearingPlan(@Param("clearingPlanId") Integer clearingPlanId);
 
-    List<DeviceCustomerInfo> getDeviceCustomerInfo(@Param("buildingId") Integer buildingId);
 
     List<DeviceDto> getDeviceListByCustomer(@Param("customerId") Integer customerId,@Param("deviceStatus")Integer deviceStatus);
 

smart-city-platform/src/main/java/com/bz/smart_city/dao/MeterReadRateMapper.java

@@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 import com.bz.smart_city.entity.MeterReadRate;
-import com.bz.smart_city.entity.MeterReadRecord;
 
 @Mapper
 public interface MeterReadRateMapper {   

smart-city-platform/src/main/java/com/bz/smart_city/dao/MeterReadRecordMapper.java

@@ -30,16 +30,7 @@ public interface MeterReadRecordMapper {
     List<MeterReadRecord> queryMeterReadRecordWithCondtion(@Param("param") CommonQueryCondition condition);
     
     List<MeterReadRecord> queryDeviceMeterReadRecordWithCondtion(@Param("param") CommonQueryCondition condition);
-    
-//    List<MeterRecordStat> statisticReadRecordsByProvince(@Param("param") CommonQueryCondition param);
-    
-//    List<MeterRecordStat> statisticReadRecordsByCity(@Param("param") CommonQueryCondition param);
-    
-//    List<MeterRecordStat> statisticReadRecordsByRegion(@Param("param") MeterReadRecord meterReadRecord);
 
-//    List<MeterRecordStat> statisticReadRecordsByBuilding(@Param("param") CommonQueryCondition param);
-    
-//    List<MeterRecordStat> statisticReadRecordsByCommunity(@Param("param") CommonQueryCondition param);
     
     int createTmpTable(@Param("param") CommonQueryCondition param,@Param("tableName") String tableName);
 

smart-city-platform/src/main/java/com/bz/smart_city/service/DeviceDataDimService.java

@@ -15,7 +15,4 @@ public interface DeviceDataDimService{
 
     List<DeviceData> queryDeviceRealtimeData(Integer system, Integer building, Integer floor, Integer startDate, Integer endDate, Integer measuring, Long deviceId);
 
-    List<MeterReadData> getMeterReadData(Integer buildingId, Integer startDate);
-
-    List<MeterReadData> getPeriodMeterReadData(Integer buildingId, Integer startDate);
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/DeviceService.java

@@ -110,7 +110,6 @@ public interface DeviceService{
     Device deviceDetail(Long deviceId);
     Pagination<DeviceDto> simpleQueryDeviceList(Integer siteId,Integer channelId , String deviceNo,String waterMeterNo, int pageNum, int pageSize);
 
-    List<DeviceCustomerInfo> getDeviceCustomerInfo(Integer buildingId);
 
     List<PlanCommunityDTO> findFaultByCommunity(Integer customerId , String communityName) ;
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceDataDimServiceImpl.java

@@ -52,15 +52,5 @@ public class DeviceDataDimServiceImpl implements DeviceDataDimService {
         return deviceDataDimMapper.queryDeviceRealtimeData(system, building, floor, startDate, endDate, measuring, deviceId);
     }
 
-    @Override
-    public List<MeterReadData> getMeterReadData(Integer buildingId, Integer startDate) {
-        log.info("begin getMeterReadData");
-        return deviceDataDimMapper.getMeterReadData(buildingId, startDate);
-    }
 
-    @Override
-    public List<MeterReadData> getPeriodMeterReadData(Integer buildingId, Integer startDate) {
-        log.info("begin getPeriodMeterReadData");
-        return deviceDataDimMapper.getPeriodMeterReadData(buildingId, startDate);
-    }
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -1182,10 +1182,6 @@ public  class DeviceServiceImpl implements DeviceService {
         return device;
     }
 
-    @Override
-    public List<DeviceCustomerInfo> getDeviceCustomerInfo(Integer buildingId) {
-        return deviceMapper.getDeviceCustomerInfo(buildingId);
-    }
 
     @Override
     public List<PlanCommunityDTO> findFaultByCommunity(Integer customerId, String communityName) {

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/MeterReadRecordServiceImpl.java

@@ -100,6 +100,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
     CustomerService customerService; 
     
     @Override
+	@Deprecated
 	public Pagination<MeterReadRecord> queryMeterReadRecord(MeterReadRecord param, int pageNum, int pageSize) {
     	log.info("begin MeterReadRecordService queryMeterReadRecord , param = "+JSON.toJSONString(param));
     	PageHelper.startPage(pageNum, pageSize);
@@ -306,6 +307,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 	}
 	
 	@Override
+	@Deprecated
 	public MeterReadRate summaryMeterReadRate(CommonQueryCondition condition) {
 		// 1,先根据周期判断开始与结束时间  ,统计周期:0 表示自定义，1表示今天，2表示昨天，7表示近7天，30表示近30天
 		MeterReadRate result = new MeterReadRate(); ;
@@ -410,6 +412,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 	}
 	
 	@Override
+	@Deprecated
 	public int createMeterReadRecord(Date date) {
 		log.info("begin MeterReadRecordService createMeterReadRecord ,date = "+ JSON.toJSONString(date));
 		Integer result = 0;

smart-city-platform/src/main/resources/mapper/DeviceDataDimMapper.xml

@@ -214,29 +214,6 @@
 		  and send_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
 	</select>
 
-    <select id="getMeterReadData" resultType="com.bz.smart_city.dto.MeterReadData">
-        SELECT
-            d.id as device_id,
-            d.device_no,
-            d.water_meter_no,
-            (select measuring_data FROM sc_device_data_dim WHERE  device_id = d.id and DATE_FORMAT(send_time,'%Y%m') = #{startDate} and measuring_code = 'WSV' ORDER BY send_time asc limit 1) start_read,
-            (select measuring_data FROM sc_device_data_dim WHERE  device_id = d.id and DATE_FORMAT(send_time,'%Y%m') = #{startDate} and measuring_code = 'WSV' ORDER BY send_time desc limit 1) end_read
-        FROM
-        sc_device d
-        WHERE d.`status` = 1 and d.sys_id != -99 and d.building_id = #{buildingId}
-    </select>
-
-    <select id="getPeriodMeterReadData" resultType="com.bz.smart_city.dto.MeterReadData">
-        SELECT
-            d.id as device_id,
-            d.device_no,
-            d.water_meter_no,
-            (select measuring_data FROM sc_device_data_dim WHERE  device_id = d.id and DATE_FORMAT(send_time,'%Y%m%d') <![CDATA[ <= ]]> #{startDate} and measuring_code = 'WSV' ORDER BY send_time asc limit 1) start_read,
-            (select measuring_data FROM sc_device_data_dim WHERE  device_id = d.id and DATE_FORMAT(send_time,'%Y%m%d') <![CDATA[ <= ]]> #{startDate} and measuring_code = 'WSV' ORDER BY send_time desc limit 1) end_read
-        FROM
-        sc_device d
-        WHERE d.`status` = 1 and d.sys_id != -99 and d.building_id = #{buildingId}
-    </select>
     <update id="updateChannel">
     	update sc_device_data_dim set sys_id = #{sysId} where device_id = #{deviceId}
     </update>

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -829,18 +829,7 @@
 						cp.id = #{clearingPlanId} 
 			)
 	</select>
-    <select id="getDeviceCustomerInfo" resultType="com.bz.smart_city.dto.DeviceCustomerInfo">
-        select
-        sd.id as device_id,
-        sd.device_no as device_no,
-        sd.loc_desc as location,
-        sil.user_name,
-        sil.user_phone,
-        sil.install_time
-        from sc_device sd
-        left join sc_install_list sil on (sil.device_id = sd.id and sil.status = 1)
-        where sd.status = 1 and sd.sys_id != -99 and sd.building_id = #{buildingId}
-    </select>
+
     <select id="getDeviceListByCustomer" resultType="com.bz.smart_city.dto.DeviceDto">
     	select 
     		<include refid="Base_Column_List" />