diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java index 5975d1b..ca3116e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java @@ -319,7 +319,7 @@ case Calendar.FEBRUARY: case Calendar.MARCH: { - startTimeThis = startTimeThis = year + "-01-01"; + startTimeThis = year + "-01-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -332,7 +332,7 @@ case Calendar.MAY: case Calendar.JUNE: { - startTimeThis = startTimeThis = year + "-04-01"; + startTimeThis = year + "-04-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -345,7 +345,7 @@ case Calendar.AUGUST: case Calendar.SEPTEMBER: { - startTimeThis = startTimeThis = year + "-07-01"; + startTimeThis = year + "-07-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -358,7 +358,7 @@ case Calendar.NOVEMBER: case Calendar.DECEMBER: { - startTimeThis = startTimeThis = year + "-10-01"; + startTimeThis = year + "-10-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java index 5975d1b..ca3116e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java @@ -319,7 +319,7 @@ case Calendar.FEBRUARY: case Calendar.MARCH: { - startTimeThis = startTimeThis = year + "-01-01"; + startTimeThis = year + "-01-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -332,7 +332,7 @@ case Calendar.MAY: case Calendar.JUNE: { - startTimeThis = startTimeThis = year + "-04-01"; + startTimeThis = year + "-04-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -345,7 +345,7 @@ case Calendar.AUGUST: case Calendar.SEPTEMBER: { - startTimeThis = startTimeThis = year + "-07-01"; + startTimeThis = year + "-07-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -358,7 +358,7 @@ case Calendar.NOVEMBER: case Calendar.DECEMBER: { - startTimeThis = startTimeThis = year + "-10-01"; + startTimeThis = year + "-10-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index d79e92e..5cf736c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -107,8 +107,6 @@ String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - if (ToolUtil.isNotEmpty(areaId) && areaId.indexOf("00") > 0) - areaId = areaId.substring(0, areaId.indexOf("00")); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); @@ -153,7 +151,7 @@ deviceDto.put("uptime", sdf4.format((Date) meterRec.get("UPTIME"))); } - deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString())); + deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString()) + "/" + deviceDto.get("POSITION").toString()); }); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java index 5975d1b..ca3116e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java @@ -319,7 +319,7 @@ case Calendar.FEBRUARY: case Calendar.MARCH: { - startTimeThis = startTimeThis = year + "-01-01"; + startTimeThis = year + "-01-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -332,7 +332,7 @@ case Calendar.MAY: case Calendar.JUNE: { - startTimeThis = startTimeThis = year + "-04-01"; + startTimeThis = year + "-04-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -345,7 +345,7 @@ case Calendar.AUGUST: case Calendar.SEPTEMBER: { - startTimeThis = startTimeThis = year + "-07-01"; + startTimeThis = year + "-07-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -358,7 +358,7 @@ case Calendar.NOVEMBER: case Calendar.DECEMBER: { - startTimeThis = startTimeThis = year + "-10-01"; + startTimeThis = year + "-10-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index d79e92e..5cf736c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -107,8 +107,6 @@ String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - if (ToolUtil.isNotEmpty(areaId) && areaId.indexOf("00") > 0) - areaId = areaId.substring(0, areaId.indexOf("00")); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); @@ -153,7 +151,7 @@ deviceDto.put("uptime", sdf4.format((Date) meterRec.get("UPTIME"))); } - deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString())); + deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString()) + "/" + deviceDto.get("POSITION").toString()); }); FileInputStream fileInputStream = null; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9492d0d..dbc15c3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -191,7 +191,12 @@ @Override public List> selectDataScopePage(DataScope dataScope, Page> page, String deviceType, String deptid, String keywords, String areaId) { - return this.baseMapper.selectWaterMeterDeviceListScopePage(dataScope, page, deviceType, deptid, keywords, areaId); + String areaIds =""; + if(ToolUtil.isNotEmpty(areaId)){ + List areaIdList= getAreaPids(Long.valueOf(areaId)); + areaIds= StringUtils.join(areaIdList.toArray(),","); + } + return this.baseMapper.selectWaterMeterDeviceListScopePage(dataScope, page, deviceType, deptid, keywords, areaIds); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java index 5975d1b..ca3116e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java @@ -319,7 +319,7 @@ case Calendar.FEBRUARY: case Calendar.MARCH: { - startTimeThis = startTimeThis = year + "-01-01"; + startTimeThis = year + "-01-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -332,7 +332,7 @@ case Calendar.MAY: case Calendar.JUNE: { - startTimeThis = startTimeThis = year + "-04-01"; + startTimeThis = year + "-04-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -345,7 +345,7 @@ case Calendar.AUGUST: case Calendar.SEPTEMBER: { - startTimeThis = startTimeThis = year + "-07-01"; + startTimeThis = year + "-07-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); @@ -358,7 +358,7 @@ case Calendar.NOVEMBER: case Calendar.DECEMBER: { - startTimeThis = startTimeThis = year + "-10-01"; + startTimeThis = year + "-10-01"; endTimeThis = sdf.format(now.getTime()).substring(0, 10); comp.add(Calendar.MONTH, -3); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index d79e92e..5cf736c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -107,8 +107,6 @@ String keywords = httpServletRequest.getParameter("keywords"); String areaId = httpServletRequest.getParameter("areaId"); - if (ToolUtil.isNotEmpty(areaId) && areaId.indexOf("00") > 0) - areaId = areaId.substring(0, areaId.indexOf("00")); page.setLimit(maxRowsExcel); page.setSize(maxRowsExcel); @@ -153,7 +151,7 @@ deviceDto.put("uptime", sdf4.format((Date) meterRec.get("UPTIME"))); } - deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString())); + deviceDto.put("fullAreaName", deviceService.getAreaFullNameById(deviceDto.get("AREA").toString()) + "/" + deviceDto.get("POSITION").toString()); }); FileInputStream fileInputStream = null; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9492d0d..dbc15c3 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -191,7 +191,12 @@ @Override public List> selectDataScopePage(DataScope dataScope, Page> page, String deviceType, String deptid, String keywords, String areaId) { - return this.baseMapper.selectWaterMeterDeviceListScopePage(dataScope, page, deviceType, deptid, keywords, areaId); + String areaIds =""; + if(ToolUtil.isNotEmpty(areaId)){ + List areaIdList= getAreaPids(Long.valueOf(areaId)); + areaIds= StringUtils.join(areaIdList.toArray(),","); + } + return this.baseMapper.selectWaterMeterDeviceListScopePage(dataScope, page, deviceType, deptid, keywords, areaIds); } @Override diff --git a/casic-web/src/main/resources/config/temp/waterMeterListTemplate.xlsx b/casic-web/src/main/resources/config/temp/waterMeterListTemplate.xlsx index 068eec9..e19fd69 100644 --- a/casic-web/src/main/resources/config/temp/waterMeterListTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/waterMeterListTemplate.xlsx Binary files differ