diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } 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 74a144d..107a876 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 @@ -9,9 +9,6 @@ import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.service.IDeviceService; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,25 +19,31 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/waterMeterData") public class WaterMeterDataController extends ExportController { - private static final Logger logger = LoggerFactory.getLogger(DeviceController.class); - @Autowired - private ICommonPermissionService permissionService; - @Autowired - private IDeviceService deviceService; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; + + public WaterMeterDataController(ICommonPermissionService permissionService, + IDeviceService deviceService) { + this.permissionService = permissionService; + this.deviceService = deviceService; + } @ApiOperation("获取水表设备列表") @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String deptid, String areaId) { + public Object listPage(String keywords, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); areaId += "%"; - List list = deviceService.selectDataScopePage(dataScope, page, "13", deptid, "", "", keywords, "", areaId); + List list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -66,4 +69,11 @@ page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } + + @ApiOperation("统计水表数量") + @RequestMapping(value = "/count") + @ResponseBody + public Object waterMeterCount() { + return new SuccessResponseData(deviceService.getWaterMeterCount()); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } 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 74a144d..107a876 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 @@ -9,9 +9,6 @@ import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.service.IDeviceService; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,25 +19,31 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/waterMeterData") public class WaterMeterDataController extends ExportController { - private static final Logger logger = LoggerFactory.getLogger(DeviceController.class); - @Autowired - private ICommonPermissionService permissionService; - @Autowired - private IDeviceService deviceService; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; + + public WaterMeterDataController(ICommonPermissionService permissionService, + IDeviceService deviceService) { + this.permissionService = permissionService; + this.deviceService = deviceService; + } @ApiOperation("获取水表设备列表") @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String deptid, String areaId) { + public Object listPage(String keywords, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); areaId += "%"; - List list = deviceService.selectDataScopePage(dataScope, page, "13", deptid, "", "", keywords, "", areaId); + List list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -66,4 +69,11 @@ page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } + + @ApiOperation("统计水表数量") + @RequestMapping(value = "/count") + @ResponseBody + public Object waterMeterCount() { + return new SuccessResponseData(deviceService.getWaterMeterCount()); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java new file mode 100644 index 0000000..eaa2073 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.modular.system.service.IDeviceService; +import io.swagger.annotations.ApiOperation; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author a203 + */ +@Controller +@RequestMapping("/waterStatistic") +public class WaterStatisticController extends BaseController { + + private final IDeviceService deviceService; + + public WaterStatisticController(IDeviceService deviceService) { + this.deviceService = deviceService; + } + + @ApiOperation("总览查询用水量") + @RequestMapping(value = "/overview") + @ResponseBody + public Object overview() { + return new SuccessResponseData(deviceService.getOverview()); + } + +// @ApiOperation("一级分区各区用水量") +// @RequestMapping(value = "/countByFirstArea") +// @ResponseBody +// public Object countByFirstArea(String devType, String startTime, String endTime) { +// if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime)); +// } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } 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 74a144d..107a876 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 @@ -9,9 +9,6 @@ import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.service.IDeviceService; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,25 +19,31 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/waterMeterData") public class WaterMeterDataController extends ExportController { - private static final Logger logger = LoggerFactory.getLogger(DeviceController.class); - @Autowired - private ICommonPermissionService permissionService; - @Autowired - private IDeviceService deviceService; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; + + public WaterMeterDataController(ICommonPermissionService permissionService, + IDeviceService deviceService) { + this.permissionService = permissionService; + this.deviceService = deviceService; + } @ApiOperation("获取水表设备列表") @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String deptid, String areaId) { + public Object listPage(String keywords, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); areaId += "%"; - List list = deviceService.selectDataScopePage(dataScope, page, "13", deptid, "", "", keywords, "", areaId); + List list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -66,4 +69,11 @@ page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } + + @ApiOperation("统计水表数量") + @RequestMapping(value = "/count") + @ResponseBody + public Object waterMeterCount() { + return new SuccessResponseData(deviceService.getWaterMeterCount()); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java new file mode 100644 index 0000000..eaa2073 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.modular.system.service.IDeviceService; +import io.swagger.annotations.ApiOperation; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author a203 + */ +@Controller +@RequestMapping("/waterStatistic") +public class WaterStatisticController extends BaseController { + + private final IDeviceService deviceService; + + public WaterStatisticController(IDeviceService deviceService) { + this.deviceService = deviceService; + } + + @ApiOperation("总览查询用水量") + @RequestMapping(value = "/overview") + @ResponseBody + public Object overview() { + return new SuccessResponseData(deviceService.getOverview()); + } + +// @ApiOperation("一级分区各区用水量") +// @RequestMapping(value = "/countByFirstArea") +// @ResponseBody +// public Object countByFirstArea(String devType, String startTime, String endTime) { +// if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime)); +// } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 8bc3bbe..6528cc1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -75,4 +75,37 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + List> selectDeviceTotalData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + String getWaterMeterCount(); + +// List> selectAlarmCountByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime); + + /** + * 总用水量和瞬时流量 + */ + Map getWaterMeter(); + + /** + * 本月总用水量 + */ + String getWaterMeterMonth(); + + /** + * 今日用水量 + */ + String getWaterMeterDay(); + + /** + * 昨日用水量 + */ + String getWaterMeterYesterday(); + + /** + * 噪声 + */ + String getNoiseData(); + +// List> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } 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 74a144d..107a876 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 @@ -9,9 +9,6 @@ import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.service.IDeviceService; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,25 +19,31 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/waterMeterData") public class WaterMeterDataController extends ExportController { - private static final Logger logger = LoggerFactory.getLogger(DeviceController.class); - @Autowired - private ICommonPermissionService permissionService; - @Autowired - private IDeviceService deviceService; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; + + public WaterMeterDataController(ICommonPermissionService permissionService, + IDeviceService deviceService) { + this.permissionService = permissionService; + this.deviceService = deviceService; + } @ApiOperation("获取水表设备列表") @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String deptid, String areaId) { + public Object listPage(String keywords, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); areaId += "%"; - List list = deviceService.selectDataScopePage(dataScope, page, "13", deptid, "", "", keywords, "", areaId); + List list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -66,4 +69,11 @@ page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } + + @ApiOperation("统计水表数量") + @RequestMapping(value = "/count") + @ResponseBody + public Object waterMeterCount() { + return new SuccessResponseData(deviceService.getWaterMeterCount()); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java new file mode 100644 index 0000000..eaa2073 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.modular.system.service.IDeviceService; +import io.swagger.annotations.ApiOperation; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author a203 + */ +@Controller +@RequestMapping("/waterStatistic") +public class WaterStatisticController extends BaseController { + + private final IDeviceService deviceService; + + public WaterStatisticController(IDeviceService deviceService) { + this.deviceService = deviceService; + } + + @ApiOperation("总览查询用水量") + @RequestMapping(value = "/overview") + @ResponseBody + public Object overview() { + return new SuccessResponseData(deviceService.getOverview()); + } + +// @ApiOperation("一级分区各区用水量") +// @RequestMapping(value = "/countByFirstArea") +// @ResponseBody +// public Object countByFirstArea(String devType, String startTime, String endTime) { +// if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime)); +// } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 8bc3bbe..6528cc1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -75,4 +75,37 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + List> selectDeviceTotalData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + String getWaterMeterCount(); + +// List> selectAlarmCountByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime); + + /** + * 总用水量和瞬时流量 + */ + Map getWaterMeter(); + + /** + * 本月总用水量 + */ + String getWaterMeterMonth(); + + /** + * 今日用水量 + */ + String getWaterMeterDay(); + + /** + * 昨日用水量 + */ + String getWaterMeterYesterday(); + + /** + * 噪声 + */ + String getNoiseData(); + +// List> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index e12776b..c328098 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -990,4 +990,80 @@ AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') #{endTime} + + + + + + + + + + + + + + + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } 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 74a144d..107a876 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 @@ -9,9 +9,6 @@ import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.service.IDeviceService; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,25 +19,31 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/waterMeterData") public class WaterMeterDataController extends ExportController { - private static final Logger logger = LoggerFactory.getLogger(DeviceController.class); - @Autowired - private ICommonPermissionService permissionService; - @Autowired - private IDeviceService deviceService; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; + + public WaterMeterDataController(ICommonPermissionService permissionService, + IDeviceService deviceService) { + this.permissionService = permissionService; + this.deviceService = deviceService; + } @ApiOperation("获取水表设备列表") @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String deptid, String areaId) { + public Object listPage(String keywords, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); areaId += "%"; - List list = deviceService.selectDataScopePage(dataScope, page, "13", deptid, "", "", keywords, "", areaId); + List list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -66,4 +69,11 @@ page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } + + @ApiOperation("统计水表数量") + @RequestMapping(value = "/count") + @ResponseBody + public Object waterMeterCount() { + return new SuccessResponseData(deviceService.getWaterMeterCount()); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java new file mode 100644 index 0000000..eaa2073 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.modular.system.service.IDeviceService; +import io.swagger.annotations.ApiOperation; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author a203 + */ +@Controller +@RequestMapping("/waterStatistic") +public class WaterStatisticController extends BaseController { + + private final IDeviceService deviceService; + + public WaterStatisticController(IDeviceService deviceService) { + this.deviceService = deviceService; + } + + @ApiOperation("总览查询用水量") + @RequestMapping(value = "/overview") + @ResponseBody + public Object overview() { + return new SuccessResponseData(deviceService.getOverview()); + } + +// @ApiOperation("一级分区各区用水量") +// @RequestMapping(value = "/countByFirstArea") +// @ResponseBody +// public Object countByFirstArea(String devType, String startTime, String endTime) { +// if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime)); +// } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 8bc3bbe..6528cc1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -75,4 +75,37 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + List> selectDeviceTotalData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + String getWaterMeterCount(); + +// List> selectAlarmCountByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime); + + /** + * 总用水量和瞬时流量 + */ + Map getWaterMeter(); + + /** + * 本月总用水量 + */ + String getWaterMeterMonth(); + + /** + * 今日用水量 + */ + String getWaterMeterDay(); + + /** + * 昨日用水量 + */ + String getWaterMeterYesterday(); + + /** + * 噪声 + */ + String getNoiseData(); + +// List> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index e12776b..c328098 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -990,4 +990,80 @@ AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') #{endTime} + + + + + + + + + + + + + + + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index ce04a34..c5a9389 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -165,4 +165,38 @@ * @return {@link Map} */ List> selectDeviceData(String devCode, String beginTime, String endTime); + + /** + * 根据条件分页查询设备历史数据 + * + * @param devCode 设备类型 + * @param beginTime 设备安装开始时间 + * @param endTime 设备安装结束时间 + * @return {@link Map} + */ + List> selectDeviceTotalData(String devCode, String beginTime, String endTime); + + /** + * 统计水表数量 + * + * @return {@link String} + */ + String getWaterMeterCount(); + + +// List> selectAlarmCountByDay(String beginTime, String endTime); + + /** + * 总览查询用水量 + * + * @return {@link String} + */ + Map getOverview(); + + /** + * 一级分区各区用水量 + * + * @return {@link List} + */ +// List> countByFirstArea(String devType, String startTime, String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 079130c..8d4750e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -301,4 +301,24 @@ } return new SuccessResponseData(deviceService.selectDeviceData(devCode, beginTime, endTime)); } + + @ApiOperation("设备总用水数据") + @RequestMapping(value = "/totalData") + @ResponseBody + public Object totalData(String devCode, String beginTime, String endTime) { + if (ToolUtil.isEmpty(devCode)) { + throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + } + return new SuccessResponseData(deviceService.selectDeviceTotalData(devCode, beginTime, endTime)); + } + +// @ApiOperation("统计设备在一定时间段内报警数") +// @RequestMapping(value = "/alarmCountByDay") +// @ResponseBody +// public Object alarmCountByDay(String beginTime, String endTime) { +// if (ToolUtil.isEmpty(beginTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.selectAlarmCountByDay(beginTime, endTime)); +// } } 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 74a144d..107a876 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 @@ -9,9 +9,6 @@ import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.service.IDeviceService; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -22,25 +19,31 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/waterMeterData") public class WaterMeterDataController extends ExportController { - private static final Logger logger = LoggerFactory.getLogger(DeviceController.class); - @Autowired - private ICommonPermissionService permissionService; - @Autowired - private IDeviceService deviceService; + private final ICommonPermissionService permissionService; + private final IDeviceService deviceService; + + public WaterMeterDataController(ICommonPermissionService permissionService, + IDeviceService deviceService) { + this.permissionService = permissionService; + this.deviceService = deviceService; + } @ApiOperation("获取水表设备列表") @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String keywords, String deptid, String areaId) { + public Object listPage(String keywords, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); areaId += "%"; - List list = deviceService.selectDataScopePage(dataScope, page, "13", deptid, "", "", keywords, "", areaId); + List list = deviceService.selectDataScopePage(dataScope, page, "13", "", "", "", keywords, "", areaId); DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -66,4 +69,11 @@ page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } + + @ApiOperation("统计水表数量") + @RequestMapping(value = "/count") + @ResponseBody + public Object waterMeterCount() { + return new SuccessResponseData(deviceService.getWaterMeterCount()); + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java new file mode 100644 index 0000000..eaa2073 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterStatisticController.java @@ -0,0 +1,40 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; +import com.casic.missiles.modular.system.service.IDeviceService; +import io.swagger.annotations.ApiOperation; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author a203 + */ +@Controller +@RequestMapping("/waterStatistic") +public class WaterStatisticController extends BaseController { + + private final IDeviceService deviceService; + + public WaterStatisticController(IDeviceService deviceService) { + this.deviceService = deviceService; + } + + @ApiOperation("总览查询用水量") + @RequestMapping(value = "/overview") + @ResponseBody + public Object overview() { + return new SuccessResponseData(deviceService.getOverview()); + } + +// @ApiOperation("一级分区各区用水量") +// @RequestMapping(value = "/countByFirstArea") +// @ResponseBody +// public Object countByFirstArea(String devType, String startTime, String endTime) { +// if (ToolUtil.isEmpty(startTime) || ToolUtil.isEmpty(endTime)) { +// throw new GunsException(GunsExceptionEnum.REQUEST_NULL); +// } +// return new SuccessResponseData(deviceService.countByFirstArea(devType, startTime, endTime)); +// } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 8bc3bbe..6528cc1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -75,4 +75,37 @@ Map selectLatestWaterMeter(@Param("devcode") String devcode); List> selectDeviceData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + List> selectDeviceTotalData(@Param("devCode") String devCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + String getWaterMeterCount(); + +// List> selectAlarmCountByDay(@Param("beginTime") String beginTime, @Param("endTime") String endTime); + + /** + * 总用水量和瞬时流量 + */ + Map getWaterMeter(); + + /** + * 本月总用水量 + */ + String getWaterMeterMonth(); + + /** + * 今日用水量 + */ + String getWaterMeterDay(); + + /** + * 昨日用水量 + */ + String getWaterMeterYesterday(); + + /** + * 噪声 + */ + String getNoiseData(); + +// List> countByFirstArea(@Param("devType") String devType, @Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index e12776b..c328098 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -990,4 +990,80 @@ AND DATE_FORMAT(dwd.DATE,'%Y-%m-%d') #{endTime} + + + + + + + + + + + + + + + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index ce04a34..c5a9389 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -165,4 +165,38 @@ * @return {@link Map} */ List> selectDeviceData(String devCode, String beginTime, String endTime); + + /** + * 根据条件分页查询设备历史数据 + * + * @param devCode 设备类型 + * @param beginTime 设备安装开始时间 + * @param endTime 设备安装结束时间 + * @return {@link Map} + */ + List> selectDeviceTotalData(String devCode, String beginTime, String endTime); + + /** + * 统计水表数量 + * + * @return {@link String} + */ + String getWaterMeterCount(); + + +// List> selectAlarmCountByDay(String beginTime, String endTime); + + /** + * 总览查询用水量 + * + * @return {@link String} + */ + Map getOverview(); + + /** + * 一级分区各区用水量 + * + * @return {@link List} + */ +// List> countByFirstArea(String devType, String startTime, String endTime); } 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 d14da2f..52d3e88 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 @@ -531,4 +531,42 @@ public List> selectDeviceData(String devCode, String beginTime, String endTime) { return this.baseMapper.selectDeviceData(devCode, beginTime, endTime); } + + @Override + public List> selectDeviceTotalData(String devCode, String beginTime, String endTime) { + return this.baseMapper.selectDeviceTotalData(devCode, beginTime, endTime); + } + + @Override + public String getWaterMeterCount() { + return this.baseMapper.getWaterMeterCount(); + } + +// @Override +// public List> selectAlarmCountByDay(String beginTime, String endTime) { +// return this.baseMapper.selectAlarmCountByDay(beginTime, endTime); +// } + + @Override + public Map getOverview() { + Map waterMeter = this.baseMapper.getWaterMeter(); + String month = this.baseMapper.getWaterMeterMonth(); + String today = this.baseMapper.getWaterMeterDay(); + String yesterday = this.baseMapper.getWaterMeterYesterday(); + String sound = this.baseMapper.getNoiseData(); + + Map resultMap = new HashMap<>(); + resultMap.put("total", String.valueOf(waterMeter.get("total"))); + resultMap.put("month", month); + resultMap.put("today", today); + resultMap.put("yesterday", yesterday); + resultMap.put("now", String.valueOf(waterMeter.get("now"))); + resultMap.put("sound", sound); + return resultMap; + } + +// @Override +// public List> countByFirstArea(String devType, String startTime, String endTime) { +// return this.baseMapper.countByFirstArea(devType, startTime, endTime); +// } }