diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java index e2308f7..9d8e8c0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java @@ -21,10 +21,8 @@ @ApiOperation("气体用气量统计") @RequestMapping("/statistics/used") - public Object statisticsUsed(@RequestParam(required = true) String deviceType, - @RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime) { - return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime); + public Object statisticsUsed(@RequestParam(required = true) String deviceType) { + return gasFlowHomeService.statisticsUsed(deviceType); } @ApiOperation("气体用气量走势图") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java index e2308f7..9d8e8c0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java @@ -21,10 +21,8 @@ @ApiOperation("气体用气量统计") @RequestMapping("/statistics/used") - public Object statisticsUsed(@RequestParam(required = true) String deviceType, - @RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime) { - return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime); + public Object statisticsUsed(@RequestParam(required = true) String deviceType) { + return gasFlowHomeService.statisticsUsed(deviceType); } @ApiOperation("气体用气量走势图") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java index 698919a..7970f28 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java @@ -6,7 +6,7 @@ */ public interface GasFlowHomeService { - Object statisticsUsed(String deviceType, String beginTime, String endTime); + Object statisticsUsed(String deviceType); Object statisticsTrend(String deviceType,Integer intervalDay); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java index e2308f7..9d8e8c0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java @@ -21,10 +21,8 @@ @ApiOperation("气体用气量统计") @RequestMapping("/statistics/used") - public Object statisticsUsed(@RequestParam(required = true) String deviceType, - @RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime) { - return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime); + public Object statisticsUsed(@RequestParam(required = true) String deviceType) { + return gasFlowHomeService.statisticsUsed(deviceType); } @ApiOperation("气体用气量走势图") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java index 698919a..7970f28 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java @@ -6,7 +6,7 @@ */ public interface GasFlowHomeService { - Object statisticsUsed(String deviceType, String beginTime, String endTime); + Object statisticsUsed(String deviceType); Object statisticsTrend(String deviceType,Integer intervalDay); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java index 1a0f5b3..c72c913 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dao.GasFlowHomeMapper; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java index e2308f7..9d8e8c0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/GasFlowHomeController.java @@ -21,10 +21,8 @@ @ApiOperation("气体用气量统计") @RequestMapping("/statistics/used") - public Object statisticsUsed(@RequestParam(required = true) String deviceType, - @RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime) { - return gasFlowHomeService.statisticsUsed(deviceType, beginTime, endTime); + public Object statisticsUsed(@RequestParam(required = true) String deviceType) { + return gasFlowHomeService.statisticsUsed(deviceType); } @ApiOperation("气体用气量走势图") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java index 698919a..7970f28 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/GasFlowHomeService.java @@ -6,7 +6,7 @@ */ public interface GasFlowHomeService { - Object statisticsUsed(String deviceType, String beginTime, String endTime); + Object statisticsUsed(String deviceType); Object statisticsTrend(String deviceType,Integer intervalDay); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java index 1a0f5b3..c72c913 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowAlarmProvider.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dao.GasFlowHomeMapper; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java index bc2e80c..b773de8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowHomeServiceImpl.java @@ -22,7 +22,7 @@ private final GasFlowDataProvider gasFlowDataProvider; private final GasFlowAlarmProvider gasFlowAlarmProvider; - public Object statisticsUsed(String deviceType, String beginTime, String endTime) { + public Object statisticsUsed(String deviceType) { ResponseData responseData = new ResponseData(); if (CheckType(deviceType)) { try {