删除弃用的方法

smart-city-common/src/main/java/com/zcxk/zoniot/smartcity/common/model/MeterReadRecord.java

@@ -42,19 +42,29 @@ public class MeterReadRecord implements Serializable {
     Integer channelId;
     @ApiModelProperty("小区Id")
     Integer communityId;
+    private String  communityName;
     @ApiModelProperty("建筑Id")
     Integer buildingId;
+    private String buildingName ;
     @ApiModelProperty("客户Id")
     Integer customerId;
+    Integer customerName;
     @ApiModelProperty("省Id")
     Integer provinceId;
+    Integer provinceName;
     @ApiModelProperty("市Id")
     Integer cityId;
+    Integer cityName;
     @ApiModelProperty("区Id")
     Integer regionId;
+    Integer regionName;
     @ApiModelProperty("设备类型Id")
     Integer deviceTypeId;
-    @ApiModelProperty("抄表时间Id")
+    @ApiModelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ApiModelProperty("设备地址")
+    private String location ;
+    @ApiModelProperty("抄表时间")
     LocalDateTime readTime;
     @ApiModelProperty("抄表状态,1：未抄，2：已抄")
     Integer readStatus ;

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

@@ -65,177 +65,6 @@ public class WaterMeterReadController {
 		meterReadRecordService.createMeterReadRecordAsync(DateTimeUtil.parseDate(readDate, "yyyyMMdd"));
 		return new AjaxMessage<>(ResultStatus.OK);
 	}
-			
-	/**************************** 新抄表记录查询接口 ************************************/
-	@ResponseBody
-	@GetMapping("/query/record/")
-	@ApiOperation(value = "抄表记录查询")
-	public AjaxMessage<Pagination<MeterReadRecord>> queryMeterReadRecord(
-			@ApiParam(value = "场景", required = true) @RequestParam(required = true) int channelId,
-			@ApiParam(value = "开始日期", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束日期", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "抄表状态,1未抄，2已抄", required = false) @RequestParam(required = false) String readStatus,
-			@ApiParam(value = "设备编号", required = false) @RequestParam(required = false) String deviceNo,
-			@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) Integer communityId,
-			@ApiParam(value = "建筑", required = false) @RequestParam(required = false) Integer buildingId,
-			@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();
-
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setSiteId(loginUser.getSiteId());
-		condition.setProgramItems(programItems);
-//        condition.setSites(loginUser.getSiteList());
-		// 2,根据入参构造查询条件
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setChannelId(channelId);
-		condition.setReadStatus(readStatus);
-		condition.setBuildingId(buildingId);
-		condition.setCommunityId(communityId);
-		condition.setCustormerId(customerId);
-
-		if (StringUtils.isNotBlank(deviceNo)) {// 前端三合一模糊条件
-			condition.setDeviceNo("%" + deviceNo + "%");
-			condition.setDevicefileNo("%" + deviceNo + "%");
-			condition.setDeviceElectricNo("%" + deviceNo + "%");
-		}
-
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-
-		Pagination<MeterReadRecord> result = meterReadRecordService.queryMeterReadRecord(condition, pageNum, pageSize);
-		log.info("结束抄表记录查询");
-		return new AjaxMessage<>(ResultStatus.OK, result);
-	}
-
-	@ResponseBody
-	@GetMapping("/stat/record/")
-	@ApiOperation(value = "抄表记录统计,小程序用按照(省、市、小区、建筑统计并一次性返回)")
-	public AjaxMessage<List<MeterRecordStat>> statisticRecord(
-			@ApiParam(value = "场景", required = true) @RequestParam(required = true) Integer channelId,
-			@ApiParam(value = "抄表状态,0所有，1未抄，2已抄", required = false) @RequestParam(required = false) String readStatus,
-			@ApiParam(value = "安装位置", required = false) @RequestParam(required = false) String location,
-			@ApiParam(value = "设备编号", required = false) @RequestParam(required = false) String deviceNo,
-			@ApiParam(value = "开始日期", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束日期", required = true) @RequestParam(required = true) int endDate) {
-		// 1,获取用户的站点信息
-		LoginUser loginUser = UserUtil.getCurrentUser();
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-
-		// 2.构造请求参数
-		CommonQueryCondition param = new CommonQueryCondition();
-		param.setSiteId(loginUser.getSiteId());
-		param.setReadStatus(readStatus);
-		param.setDeviceNo(deviceNo);
-		param.setLocation(location);
-		param.setStartDate(startDate);
-		param.setEndDate(endDate);
-		param.setChannelId(channelId);
-		param.setProgramItems(programItems);
-		List<MeterRecordStat> rtnList = meterReadRecordService.statisticRecords(param);
-		return new AjaxMessage<>(ResultStatus.OK, rtnList);
-	}
-
-
-
-	@ResponseBody
-	@GetMapping("/analysis/rate/{channelId}/{building}/{period}/")
-	@ApiOperation(value = "抄表率趋势分析")
-	public AjaxMessage<List<MeterReadRate>> analysisMeterReadRate(
-			@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, 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.setPeriod(period);
-		condition.setProgramItems(programItems);
-
-//        MeterReadRate param = new MeterReadRate();
-//        param.setSiteId(loginUser.getSiteId());
-//        param.setBuildingId(building);
-//        param.setStartDate(startDate);
-//        param.setEndDate(endDate);
-//        param.setPeriod(period);
-		List<MeterReadRate> result = meterReadRecordService.analysisMeterReadRate(condition);
-		log.info("结束抄表率趋势分析查询");
-		return new AjaxMessage<>(ResultStatus.OK, result);
-	}
-
-	/****************************************
-	 * 新抄表记录导出接口
-	 ***************************************************/
-	@GetMapping("/getMeterReadRecordExcel")
-	@ApiOperation(value = "抄表记录导出")
-	public void getMeterReadRecordExcel(
-			@ApiParam(value = "场景", required = true) @RequestParam(required = true) int channelId,
-			@ApiParam(value = "开始日期", required = true) @RequestParam(required = true) int startDate,
-			@ApiParam(value = "结束日期", required = true) @RequestParam(required = true) int endDate,
-			@ApiParam(value = "抄表状态,1未抄，2已抄", required = false) @RequestParam(required = false) String readStatus,
-			@ApiParam(value = "设备编号", required = false) @RequestParam(required = false) String deviceNo,
-			@ApiParam(value = "客户", required = false) @RequestParam(required = false) Integer custormerId,
-			@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) Integer communityId,
-			@ApiParam(value = "建筑", required = false) @RequestParam(required = false) Integer buildingId,
-			@ApiParam(value = "token", required = true) @RequestParam(required = true) String token,
-			HttpServletResponse httpServletResponse) {
-		log.info("开始抄表记录导出");
-		// 1,获取用户的站点信息,进行数据权限控制
-		LoginUser loginUser = UserUtil.getCurrentUser();
-
-		List<ProgramItem> programItems = loginUser.getDataPermissionMap().get(loginUser.getSiteId());
-
-		CommonQueryCondition condition = new CommonQueryCondition();
-		condition.setProgramItems(programItems);
-		condition.setSites(loginUser.getSiteList());
-		// 2,根据入参构造查询条件
-		condition.setStartDate(startDate);
-		condition.setEndDate(endDate);
-		condition.setChannelId(channelId);
-		condition.setReadStatus(readStatus);
-		condition.setBuildingId(buildingId);
-		condition.setCommunityId(communityId);
-		condition.setCustormerId(custormerId);
-
-		if (StringUtils.isNotBlank(deviceNo)) {// 前端三合一模糊条件
-			condition.setDeviceNo("%" + deviceNo + "%");
-			condition.setDevicefileNo("%" + deviceNo + "%");
-			condition.setDeviceElectricNo("%" + deviceNo + "%");
-		}
-
-		if (StringUtils.isNotBlank(collectorCode)) {
-			condition.setCollectorCode("%" + collectorCode + "%");
-		}
-		if (StringUtils.isNotBlank(concentratorCode)) {
-			condition.setConcentratorCode("%" + concentratorCode + "%");
-		}
-
-		meterReadRecordService.getMeterReadRecordExcel(condition, httpServletResponse);
-		log.info("结束抄表记录导出");
-	}
 
 
 

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

@@ -25,24 +25,12 @@ public interface MeterReadRecordMapper {
     
     int updateHitoryData(@Param("meterReadRecord") MeterReadRecord meterReadRecord);
     
-    List<MeterReadRecord> queryMeterReadRecord(@Param("param") MeterReadRecord meterReadRecord);
-    
     List<MeterReadRecord> queryMeterReadRecordWithCondtion(@Param("param") CommonQueryCondition condition);
     
     List<MeterReadRecord> queryDeviceMeterReadRecordWithCondtion(@Param("param") CommonQueryCondition condition);
 
     
     int createTmpTable(@Param("param") CommonQueryCondition param,@Param("tableName") String tableName);
-
-    int dropTmpTable(@Param("tableName") String tableName);
-    
-    List<MeterRecordStat>  statisticReadRecordsByProvince(@Param("tableName") String tableName);
-
-    List<MeterRecordStat>  statisticReadRecordsByCity(@Param("tableName") String tableName);
-
-    List<MeterRecordStat>  statisticReadRecordsByCommuinty(@Param("tableName") String tableName);
-
-    List<MeterRecordStat>  statisticReadRecordsByBuilding(@Param("tableName") String tableName);
     
     List<DeviceDto> queryUnReadDeviceList(@Param("param") CommonQueryCondition condition);
 

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

@@ -33,10 +33,6 @@ public interface MeterReadRecordService{
 
     public int createMeterReadRecordForRollback(Date date);
     
-    List<MeterRecordStat> statisticRecords(CommonQueryCondition param);
-    
-    public Pagination<MeterReadRecord> queryMeterReadRecord(MeterReadRecord param ,int pageNum ,int pageSize);
-    
     
     public Pagination<MeterReadRecord> queryMeterReadRecord(CommonQueryCondition condition ,int pageNum ,int pageSize);
     
@@ -51,12 +47,6 @@ public interface MeterReadRecordService{
     
     public List<MeterReadRate> analysisMeterReadRate(CommonQueryCondition condition);
 
-    void getMeterReadRateExcel(MeterReadRate param, HttpServletResponse httpServletResponse);
-    
-    void getMeterReadRecordExcel(MeterReadRecord param , HttpServletResponse httpServletResponse);
-    
-    void getMeterReadRecordExcel(CommonQueryCondition condition ,HttpServletResponse httpServletResponse);
-
     WaterConsumptionSummaryDto waterConsumptionSummary(CommonQueryCondition condition);
 
     Pagination<WaterConsumptionDto> getWaterConsumptionList(CommonQueryCondition condition, Integer pageNum, Integer pageSize);

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

@@ -98,22 +98,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
     
     @Resource
     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);
-    	if(StringUtils.isNotEmpty(param.getLocation())){
-    		param.setLocation("%"+param.getLocation()+"%");
-    	}
-    	if(StringUtils.isNotEmpty(param.getDeviceNo())) {
-    		param.setDeviceNo("%"+param.getDeviceNo()+"%");
-    	}
-    	List<MeterReadRecord> result = meterReadRecordMapper.queryMeterReadRecord(param);
-    	log.info("end MeterReadRecordService queryMeterReadRecord , result.size = "+result.size());
-		return new Pagination<MeterReadRecord>(result);
-	}
+
 
     @Override
 	public Pagination<MeterReadRecord> queryMeterReadRecord(CommonQueryCondition condition, int pageNum, int pageSize) {
@@ -129,56 +114,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
     	log.info("end MeterReadRecordService queryMeterReadRecord , result.size = "+result.size());
     	return new Pagination<MeterReadRecord>(result);
 	}
-    
-    @Override
-	public List<MeterRecordStat> statisticRecords(CommonQueryCondition param) {
-    	Date startTime = new Date();
-    	if(StringUtils.isNotEmpty(param.getLocation())){
-    		param.setLocation("%"+param.getLocation()+"%");
-    	}
-    	if(StringUtils.isNotEmpty(param.getDeviceNo())) {
-    		param.setDeviceNo("%"+param.getDeviceNo()+"%");
-    	}
-    	List<MeterRecordStat> datas = newArrayList();
-    	meterReadRecordMapper.createTmpTable(param, "tmp_query");
-    	List<MeterRecordStat> provinceDatas = meterReadRecordMapper.statisticReadRecordsByProvince("tmp_query");
-    	datas.addAll(provinceDatas);
-    	List<MeterRecordStat> cityDatas = meterReadRecordMapper.statisticReadRecordsByCity("tmp_query");
-    	datas.addAll(cityDatas);
-    	List<MeterRecordStat> communityDatas = meterReadRecordMapper.statisticReadRecordsByCommuinty("tmp_query");
-    	datas.addAll(communityDatas);
-    	List<MeterRecordStat> buildingDatas = meterReadRecordMapper.statisticReadRecordsByBuilding("tmp_query");
-    	datas.addAll(buildingDatas);
-    	meterReadRecordMapper.dropTmpTable("tmp_query");
-//    	// 1,省份统计
-//    	List<MeterRecordStat> provinceStatDatas = meterReadRecordMapper.statisticReadRecordsByProvince(param);
-//    	for(MeterRecordStat provinceStatData : provinceStatDatas) {
-//    		Integer provinceId = provinceStatData.getItemId();
-//    		param.setProvince(provinceId);
-//    		// 2,进行市统计
-//    		List<MeterRecordStat> cityStatDatas = meterReadRecordMapper.statisticReadRecordsByCity(param);
-//    		provinceStatData.setChildrenStats(cityStatDatas);
-//    		for(MeterRecordStat cityStatData : cityStatDatas ) {
-//    			Integer cityId = cityStatData.getItemId();
-//    			param.setCity(cityId);
-//    			// 3,进行小区统计
-//    			List<MeterRecordStat> communityStatDatas = meterReadRecordMapper.statisticReadRecordsByCommunity(param);
-//    			cityStatData.setChildrenStats(communityStatDatas);
-//    			for(MeterRecordStat communityStatData : communityStatDatas) {
-//    				Integer communityId = communityStatData.getItemId();
-//    				param.setCommunityId(communityId);
-////    				//4,进行建筑统计
-//    				List<MeterRecordStat> buildingStatDatas = meterReadRecordMapper.statisticReadRecordsByBuilding(param);
-//    				communityStatData.setChildrenStats(buildingStatDatas);
-//    			}
-////    			List<MeterRecordStat> buildingStatDatas = meterReadRecordMapper.statisticReadRecordsByBuilding(param);
-////    			cityStatData.setChildrenStats(buildingStatDatas);
-//    		}
-//    	}
-		long cost = (System.currentTimeMillis()-startTime.getTime())/1000 ;
-    	log.info("The cost time is {}",cost);
-    	return TreeUtil.getTreeList(datas, 100000, 1);
-	}
+
     @Override
     public List<MeterReadRate> analysisMeterReadRate(CommonQueryCondition condition){
     	List<MeterReadRate>  result = new ArrayList<MeterReadRate>();
@@ -410,7 +346,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 	public int createMeterReadRecordAsync(Date date) {
 		return createMeterReadRecord(date);
 	}
-	
+
 	@Override
 	@Deprecated
 	public int createMeterReadRecord(Date date) {
@@ -432,19 +368,19 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 		param.setDeviceStatusList(statusList);
 		param.setDeviceType(type.getDeviceTypeId());
 		int total = deviceMapper.countDevice(param);
-		
+
 		// 2,分页获取设备并生成抄表记录
 		int pageSize = 1000 ;
-		
+
 		int totalPage = total / pageSize;
 		if (total % pageSize != 0){
 			totalPage++;
 		}
 
-		
+
 		for(int i = 1 ;i <= totalPage; i++) {
 			int start = (i - 1) * pageSize;
-			
+
 			List<DeviceDto> deviceList = deviceMapper.getDeviceList(param, start, pageSize);
 			List<MeterReadRecord> records = new ArrayList<MeterReadRecord>();
 			for(DeviceDto device : deviceList) {
@@ -452,7 +388,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 				Integer startDate = Integer.parseInt(DateTimeUtil.formatDate(DateTimeUtil.before(date, 1), "yyyyMMdd"));
 				Integer endDate = Integer.parseInt(DateTimeUtil.formatDate(date, "yyyyMMdd"));
 				MeterReadRecord record = new MeterReadRecord();
-				String deviceNo = device.getDeviceNo() ; 
+				String deviceNo = device.getDeviceNo() ;
 				Long deviceId = device.getId();
 				record.setId(idWorker.nextId());
 				record.setSiteId(device.getSiteId());
@@ -493,7 +429,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 						p.setEndDate(endDate);
 						p.setMeasuringCode("WSV");
 						List<DeviceDataDim> data = deviceDataDimMapper.queryDeviceDataDim(p,1);
-						
+
 						if(data.size() > 0) {
 							readStatus = "2" ; // 已抄
 							record.setReadTime(data.get(0).getSendTime()); // 抄表时间
@@ -509,7 +445,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 					p.setEndDate(endDate);
 					p.setMeasuringCode("WSV");
 					List<DeviceDataDim> data = deviceDataDimMapper.queryDeviceDataDim(p,1);
-					
+
 					if(data.size() > 0) {
 						readStatus = "2" ; // 已抄
 						record.setReadTime(data.get(0).getSendTime()); // 抄表时间
@@ -550,123 +486,13 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 				Thread.sleep(10000l);
 			} catch (InterruptedException e) {
 				log.error("thread interrupted", e);
-			} 
+			}
 		}
-		
+
 		log.info("end MeterReadRecordService createMeterReadRecord ,result = "+ result);
 		return total;
 	}
 
-	@Override
-	public void getMeterReadRateExcel(MeterReadRate param, HttpServletResponse httpServletResponse) {
-		log.info("begin MeterReadRecordService getMeterReadRateExcel , param = "+JSON.toJSONString(param));
-		List<MeterReadRate> list = meterReadRateMapper.queryMeterReadRate(param);
-		param.setPeriod(0);
-		MeterReadRate total = this.summaryMeterReadRate(param);
-		total.setBuildingName("合计");
-		list.add(total);
-
-		String title = "抄表率";
-		String[] rowsName = new String[]{"序号", "建筑名称", "水表数量", "应抄数量", "实抄数量", "未抄数量", "抄表率（%）","抄表日期"};
-		List<Object[]> dataList = newArrayList();
-		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-		Object[] objs = null;
-		for (int i = 0; i < list.size(); i++) {
-			MeterReadRate meterReadRate = list.get(i);
-			objs = new Object[rowsName.length];
-			objs[0] = i;
-			objs[1] = meterReadRate.getBuildingName();
-			objs[2] = meterReadRate.getDeviceCount();
-			objs[3] = meterReadRate.getReadTimes();
-			objs[4] = meterReadRate.getRealReadTimes();
-			objs[5] = meterReadRate.getUnReadTimes();
-			objs[6] = meterReadRate.getReadRate();
-			objs[7] = meterReadRate.getStatDate()!=null?LocalDate.parse(meterReadRate.getStatDate().toString(), formatter).format(df):"";
-			dataList.add(objs);
-		}
-		ExcelUtil excelUtil = new ExcelUtil(title, rowsName, dataList);
-		try {
-			excelUtil.export(httpServletResponse);
-		} catch (Exception e) {
-			throw new ServiceException(-900, "导出异常");
-		}
-		log.info("end MeterReadRecordService getMeterReadRateExcel , result.size = "+list.size());
-	}
-
-	@Override
-	public void getMeterReadRecordExcel(MeterReadRecord param, HttpServletResponse httpServletResponse) {
-		log.info("begin MeterReadRecordService getMeterReadRecordExcel,param = "+JSON.toJSONString(param));
-		if(StringUtils.isNotEmpty(param.getLocation())){
-    		param.setLocation("%"+param.getLocation()+"%");
-    	}
-    	if(StringUtils.isNotEmpty(param.getDeviceNo())) {
-    		param.setDeviceNo("%"+param.getDeviceNo()+"%");
-    	}
-    	List<MeterReadRecord> result = meterReadRecordMapper.queryMeterReadRecord(param);
-    	
-    	String title = "抄表记录";
-		String[] rowsName = new String[]{"序号", "设备编号", "抄表状态", "抄表止度", "抄表时间", "所属建筑", "位置信息"};
-		List<Object[]> dataList = newArrayList();
-		Object[] objs = null;
-		for (int i = 0; i < result.size(); i++) {
-			MeterReadRecord meterReadRecord = result.get(i);
-			objs = new Object[rowsName.length];
-			objs[0] = i;
-			objs[1] = meterReadRecord.getDeviceNo();
-			objs[2] = MeterReadEnum.getName(meterReadRecord.getReadStatus()) ;
-			objs[3] = meterReadRecord.getReadData() == null ? "":meterReadRecord.getReadData()+"度";
-			objs[4] = meterReadRecord.getReadTime() == null ?"":DateTimeUtil.formatDate(meterReadRecord.getReadTime(), DateTimeUtil.DATE_TIME_FORMAT);
-			objs[5] = meterReadRecord.getBuildingName();
-			objs[6] = meterReadRecord.getLocation();
-			dataList.add(objs);
-		}
-		ExcelUtil excelUtil = new ExcelUtil(title, rowsName, dataList);
-		try {
-			excelUtil.export(httpServletResponse);
-		} catch (Exception e) {
-			throw new ServiceException(-900, "导出异常");
-		}
-		log.info("end MeterReadRecordService getMeterReadRecordExcel , result.size = "+result.size());
-
-	}
-	
-	@Override
-	public void getMeterReadRecordExcel(CommonQueryCondition condition, HttpServletResponse httpServletResponse) {
-		log.info("begin MeterReadRecordService getMeterReadRecordExcel,param = "+JSON.toJSONString(condition));
-		List<MeterReadRecord> result = meterReadRecordMapper.queryMeterReadRecordWithCondtion(condition);
-		String title = "抄表记录";
-		String[] rowsName = new String[]{"序号", "节点编号","水表电子号","水表档案号","集中器编码","采集器编码","水表厂商", "所属客户", "抄表状态", "抄表止度", "抄表时间", "小区","建筑", "位置信息"};
-		List<Object[]> dataList = newArrayList();
-		Object[] objs = null;
-		for (int i = 0; i < result.size(); i++) {
-			MeterReadRecord meterReadRecord = result.get(i);
-			objs = new Object[rowsName.length];
-			objs[0] = i;
-			objs[1] = meterReadRecord.getDeviceNo();
-			objs[2] = meterReadRecord.getMeterNo();
-			objs[3] = meterReadRecord.getMeterFileNo();
-			objs[4] = meterReadRecord.getConcentratorNo();
-			objs[5] = meterReadRecord.getCollectorNo();
-			objs[6] = meterReadRecord.getFactoryName();
-			objs[7] = meterReadRecord.getCustomerName();
-			objs[8] = MeterReadEnum.getName(meterReadRecord.getReadStatus()) ;
-			objs[9] = meterReadRecord.getReadData() == null ? "":meterReadRecord.getReadData()+"度";
-			objs[10] = meterReadRecord.getReadTime() == null ?"":DateTimeUtil.formatDate(meterReadRecord.getReadTime(), DateTimeUtil.DATE_TIME_FORMAT);
-			objs[11] = meterReadRecord.getCommunityName();
-			objs[12] = meterReadRecord.getBuildingName();
-			objs[13] = meterReadRecord.getLocation();
-			dataList.add(objs);
-		}
-		ExcelUtil excelUtil = new ExcelUtil(title, rowsName, dataList);
-		try {
-			excelUtil.export(httpServletResponse);
-		} catch (Exception e) {
-			throw new ServiceException(-900, "导出异常");
-		}
-		log.info("end MeterReadRecordService getMeterReadRecordExcel , result.size = "+result.size());
-	}
-	
 	@Override
     public int insert(MeterReadRecord meterReadRecord){
         return meterReadRecordMapper.insert(meterReadRecord);
@@ -761,19 +587,19 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 		statusList.add(4); // 预警
 		param.setDeviceStatusList(statusList);
 		int total = deviceMapper.countDevice(param);
-		
+
 		// 2,分页获取设备并生成抄表记录
 		int pageSize = 1000 ;
-		
+
 		int totalPage = total / pageSize;
 		if (total % pageSize != 0){
 			totalPage++;
 		}
 
-		
+
 		for(int i = 1 ;i <= totalPage; i++) {
 			int start = (i - 1) * pageSize;
-			
+
 			List<DeviceDto> deviceList = deviceMapper.getDeviceList(param, start, pageSize);
 			List<MeterReadRecord> records = new ArrayList<MeterReadRecord>();
 			for(DeviceDto device : deviceList) {
@@ -781,7 +607,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 				Integer startDate = Integer.parseInt(DateTimeUtil.formatDate(DateTimeUtil.before(date, 1), "yyyyMMdd"));
 				Integer endDate = Integer.parseInt(DateTimeUtil.formatDate(date, "yyyyMMdd"));
 				MeterReadRecord record = new MeterReadRecord();
-				String deviceNo = device.getDeviceNo() ; 
+				String deviceNo = device.getDeviceNo() ;
 				Long deviceId = device.getId();
 				record.setId(idWorker.nextId());
 				record.setSiteId(device.getSiteId());
@@ -823,7 +649,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 						p.setEndDate(endDate);
 						p.setMeasuringCode("WSV");
 						List<DeviceDataDim> data = deviceDataDimMapper.queryDeviceDataDim(p,1);
-						
+
 						if(data.size() > 0) {
 							readStatus = "2" ; // 已抄
 							record.setReadTime(data.get(0).getSendTime()); // 抄表时间
@@ -839,7 +665,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 					p.setEndDate(endDate);
 					p.setMeasuringCode("WSV");
 					List<DeviceDataDim> data = deviceDataDimMapper.queryDeviceDataDim(p,1);
-					
+
 					if(data.size() > 0) {
 						readStatus = "2" ; // 已抄
 						record.setReadTime(data.get(0).getSendTime()); // 抄表时间
@@ -857,9 +683,9 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 				Thread.sleep(10000l);
 			} catch (InterruptedException e) {
 				log.error("thread interrupted", e);
-			} 
+			}
 		}
-		
+
 		log.info("end MeterReadRecordService createMeterReadRecord ,result = "+ result);
 		return total;
 	}

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

@@ -294,42 +294,7 @@
         </set>
         WHERE id = #{meterReadRecord.id,jdbcType=BIGINT}
     </update>
-    <select id="queryMeterReadRecord" resultType="com.bz.smart_city.entity.MeterReadRecord">
-    	select
-    		m.id as id,
-	        read_date,
-	        m.site_id as site_id,
-	        m.sys_id as sys_id,
-	        m.province as province,
-	        m.city as city,
-	        m.region as region,
-	        m.community as community,
-	        m.building_id as building_id,
-	        b.name as building_name,
-	        m.location as location,
-	        device_type_id,
-	        device_id,
-	        device_no,
-	        meter_no,
-	        meter_file_no,
-	        read_time,
-	        read_status,
-	        read_data,
-	        m.status as status
-    	from 
-    		sc_meter_read_record m
-    		left join sc_building b on ( building_id = b.id)
-    	where 1=1
-    		<if test="param.siteId != null and param.siteId != 0"> and m.site_id = #{param.siteId}</if>
-    		<if test="param.buildingId != null and param.buildingId != 0"> and building_id = #{param.buildingId}</if>
-    		<if test = "param.deviceNo != null and param.deviceNo != ''"> and device_no like #{param.deviceNo}</if>
-    		<if test = 'param.readStatus != null and param.readStatus != "0"'> and read_status = #{param.readStatus,jdbcType=VARCHAR}</if>
-    		<if test = "param.location != null and param.location != ''"> and location like #{param.location}</if>
-    		<if test = "param.startDate != null and param.startDate != 0"> and read_date >= #{param.startDate}</if>
-    		<if test = "param.endDate != null and param.endDate != 0"> and read_date <![CDATA[ <= ]]>  #{param.endDate}</if>
-    		and m.status = 1
-    		order by read_time desc 
-    </select>
+
     <!-- 
     <select id="statisticReadRecordsByProvince" resultType="com.bz.smart_city.entity.MeterRecordStat">
     	SELECT
@@ -586,62 +551,7 @@
    		<if test = "param.startDate != null and param.startDate != 0"> and  read_date >= #{param.startDate}</if>
    		<if test = "param.endDate != null and param.endDate != 0"> and  read_date <![CDATA[ <= ]]>  #{param.endDate}</if>
     </update>
-    
-    <update id="dropTmpTable" >
-  	   drop TEMPORARY  table if exists ${tableName}
-  	</update>
-    
-    <select id= "statisticReadRecordsByProvince" resultType="com.bz.smart_city.entity.MeterRecordStat">
-    	select
-    		1 as level,
-    		a.parent_id as parent_id,
-    		province as item_id,
-    		a.name as item_name,
-    		count(1) as total
-    	from 
-    		${tableName}
-    	left join sc_area  a on (province = a.id)
-    	group by province,a.name,a.parent_id
-    </select>
-    <select id= "statisticReadRecordsByCity" resultType="com.bz.smart_city.entity.MeterRecordStat">
-    	select
-    		2 as level,
-    		a.parent_id as parent_id,
-    		city as item_id,
-    		a.name as item_name,
-    		count(1) as total
-    	from 
-    		${tableName}
-    	left join sc_area  a on (city = a.id)
-    	group by city,a.name,a.parent_id
-    </select>
-    
-    <select id= "statisticReadRecordsByCommuinty" resultType="com.bz.smart_city.entity.MeterRecordStat">
-    	select
-    		3 as level,
-    		a.city as parent_id,
-    		community as item_id,
-    		a.name as item_name,
-    		count(1) as total
-    	from 
-    		${tableName}
-    	left join sc_community  a on (community = a.id)
-    	group by community,a.name,a.city
-    </select>
-    
-    
-    <select id= "statisticReadRecordsByBuilding" resultType="com.bz.smart_city.entity.MeterRecordStat">
-    	select
-    		4 as level,
-    		a.community as parent_id,
-    		building_id as item_id,
-    		a.name as item_name,
-    		count(1) as total
-    	from 
-    		${tableName}
-    	left join sc_building  a on (building_id = a.id)
-    	group by building_id,a.name,a.community
-    </select>
+
     
     <!-- 
     <select id="statisticReadRecordsByRegion" resultType="com.bz.smart_city.entity.MeterRecordStat">

smart-city-platform/src/test/java/com/bz/smart_city/MeterReadRecordServiceTests.java

@@ -171,31 +171,7 @@ public class MeterReadRecordServiceTests {
 		Pagination<StatMeterReadRateDto> rtnList = statMeterReadRateByCollectorService.getRateListByCollector(condition, 1, 15);
 		System.out.println(JSON.toJSONString(rtnList));
 	}
-	
-	@Test
-	public void statisticRecordsTest() {
-		CommonQueryCondition param = new CommonQueryCondition();
 
-		param.setStartDate(20190425);
-		param.setEndDate(20190425);
-		param.setChannelId(55);
-//		param.setSiteId(44);
-		
-		ArrayList<ProgramItem> programItems = new ArrayList<ProgramItem>();
-		ProgramItem item = new ProgramItem();
-		item.setDimensionCode("PROVINCE");
-		item.setDimensionValue("520000");
-		programItems.add(item);
-		ProgramItem item1 = new ProgramItem();
-		item1.setDimensionCode("CITY");
-		item1.setDimensionValue("520100");
-		programItems.add(item1);
-		param.setProgramItems(programItems);
-		
-		// param.setLocation("世纪新城");
-		List<MeterRecordStat> rtnList = meterReadRecordService.statisticRecords(param);
-		System.out.println(JSON.toJSONString(rtnList));
-	}
 	
 	
 	@Test