diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java index 996f671..f927a7a 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/controller/AlgorithmClassComponentController.java @@ -74,6 +74,10 @@ public class AlgorithmClassComponentController { @ApiOperation("设置算法关联主设备部件状态") public ResponseResult setAlgorithmClassComponentStatus(String id, String isenable) throws ParseException { boolean isOK = algorithmClassComponentService.setAlgorithmClassComponentStatus(id, isenable); - return ResponseResult.success(); + if (isOK) { + return ResponseResult.success(); + } else { + return ResponseResult.error(); + } } } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java index 294279c..d9daf93 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/IAlgorithmClassComponentService.java @@ -48,7 +48,17 @@ public interface IAlgorithmClassComponentService extends IService + ***********************************/ Map getMainDeviceInfo(String componentId); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java index e561792..b6c54e7 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmClassComponentServiceImpl.java @@ -155,6 +155,11 @@ public class AlgorithmClassComponentServiceImpl extends ServiceImpl + ***********************************/ @Override public Map getMainDeviceInfo(String componentId) { return algorithmClassComponentMapper.getMainDeviceInfo(componentId); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java index b1075dc..4030f42 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmParamsServiceImpl.java @@ -182,6 +182,16 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl senData) { @@ -191,7 +201,6 @@ public class AlgorithmParamsServiceImpl extends ServiceImpl { + /********************************** + * 用途说明: 分页查询变电站辅控设备告警参数设置 + * 参数说明 meterDeviceId 辅控设备ID + * 参数说明 signalId 信号ID + * 参数说明 alarmType 告警类型 + * 参数说明 alarmLevel 告警等级 + * 参数说明 page + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page + ***********************************/ Page getDeviceAlarmParameterPage(String meterDeviceId, String signalId, String alarmType, String alarmLevel, Page page); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceSignalMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceSignalMapper.java index 3de0ab2..f8e280f 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceSignalMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceSignalMapper.java @@ -36,7 +36,22 @@ public interface DeviceSignalMapper extends BaseMapper { Map querySignalDataById(String signalId); + /********************************** + * 用途说明: 查询遥信数据 + * 参数说明 page + * 参数说明 areaId 区域ID + * 参数说明 type 类型 + * 参数说明 stationId 站点ID + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + ***********************************/ Page> queryYxData(Page> page, String areaId, String type, String stationId); + /********************************** + * 用途说明: 查询遥信数据统计 + * 参数说明 areaId 区域ID + * 参数说明 type 类型 + * 参数说明 stationId 站点ID + * 返回值说明: java.util.List> + ***********************************/ List> countDeviceTypeStatus(String areaId, String type, String stationId); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java index c5f9b11..40cefe1 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java @@ -36,7 +36,11 @@ public interface DeviceWorkDataMapper extends BaseMapper { ***********************************/ List getHistoricalCurve(String signalId, String type); - + /********************************** + * 用途说明: 查询变电站设备运行数据 + * 参数说明 stationId 变电站id + * 返回值说明: java.util.List + ***********************************/ List> getDeviceWorkData(String stationId); List getHistoricalCurveList(List signalIdList,String type); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java index 1481dcc..b0c35bf 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java @@ -28,6 +28,15 @@ public interface IDeviceAlarmParameterService extends IService + ***********************************/ Page getDeviceAlarmParameterPage(String meterDeviceId, String signalId, String alarmType, String alarmLevel, Page page); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceSignalService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceSignalService.java index 8427bf3..1720f4e 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceSignalService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceSignalService.java @@ -69,8 +69,23 @@ public interface IDeviceSignalService extends IService { ***********************************/ Map querySignalDataById(String signalId); + /********************************** + * 用途说明: 查询遥信数据 + * 参数说明 page + * 参数说明 areaId 区域ID + * 参数说明 type 类型 + * 参数说明 stationId 站点ID + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + ***********************************/ Page> queryYxData(Page> page, String areaId, String type,String stationId); + /********************************** + * 用途说明: 查询遥信数据统计 + * 参数说明 areaId 区域ID + * 参数说明 type 类型 + * 参数说明 stationId 站点ID + * 返回值说明: java.util.List> + ***********************************/ List> countDeviceTypeStatus(String areaId, String type, String stationId); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java index 7e95bbe..1d805dc 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java @@ -55,8 +55,21 @@ public interface IDeviceWorkDataService extends IService { ***********************************/ List getHistoricalCurveList(List signalIdList,String type); + /********************************** + * 用途说明: 查询变电站设备运行数据 + * 参数说明 stationId 变电站id + * 返回值说明: java.util.List + ***********************************/ List> getDeviceWorkData(String stationId); + /********************************** + * 用途说明: 导出环境历史数据 + * 参数说明 stationId 变电站id + * 参数说明 signalId 信号id + * 参数说明 startDate 开始时间 + * 参数说明 endDate 结束时间 + * 响应参数说明: 无 + ***********************************/ void exportDeviceWorkData(String stationId,String signalId, String startDate, String endDate, HttpServletResponse response) throws IOException; } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java index 0f8ed85..9e00fef 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java @@ -43,6 +43,15 @@ public class DeviceAlarmParameterServiceImpl extends ServiceImpl + ***********************************/ @Override public Page getDeviceAlarmParameterPage(String meterDeviceId, String signalId, String alarmType, String alarmLevel, diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java index 4048a88..6b75237 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceSignalServiceImpl.java @@ -211,12 +211,27 @@ public class DeviceSignalServiceImpl extends ServiceImpl> + ***********************************/ @Override public Page> queryYxData(Page> page, String areaId, String type, String stationId) { return deviceSignalMapper.queryYxData(page, areaId, type, stationId); } + /********************************** + * 用途说明: 查询遥信数据统计 + * 参数说明 areaId 区域ID + * 参数说明 type 类型 + * 参数说明 stationId 站点ID + * 返回值说明: java.util.List> + ***********************************/ @Override public List> countDeviceTypeStatus(String areaId, String type, String stationId) { return deviceSignalMapper.countDeviceTypeStatus(areaId, type, stationId); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java index d47f9d7..8bb2d46 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java @@ -103,11 +103,24 @@ public class DeviceWorkDataServiceImpl extends ServiceImpl + ***********************************/ @Override public List> getDeviceWorkData(String stationId) { return deviceWorkDataMapper.getDeviceWorkData(stationId); } + /********************************** + * 用途说明: 导出环境历史数据 + * 参数说明 stationId 变电站id + * 参数说明 signalId 信号id + * 参数说明 startDate 开始时间 + * 参数说明 endDate 结束时间 + * 响应参数说明: 无 + ***********************************/ @Override public void exportDeviceWorkData(String stationId,String signalId, String startDate, String endDate, HttpServletResponse response) throws IOException {