Commit a7a73fb4 authored by wujiang's avatar wujiang

修改返回结果

parent 76b872ec
...@@ -438,7 +438,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -438,7 +438,7 @@ public class MonitorFanIdxController extends BaseController {
@ApiOperation(value = "集电线路图左侧 集电线列表") @ApiOperation(value = "集电线路图左侧 集电线列表")
@GetMapping("/jdTree") @GetMapping("/jdTree")
@Scheduled(cron = "0/10 * * * * ? ") @Scheduled(cron = "0/10 * * * * ? ")
public ResponseModel<IPage<Map<String, Object>>> getStatusJDX() { public ResponseModel<Object> getStatusJDX() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper); List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
for (StationBasic stationBasic : stationBasics) { for (StationBasic stationBasic : stationBasics) {
...@@ -458,7 +458,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -458,7 +458,7 @@ public class MonitorFanIdxController extends BaseController {
@ApiOperation(value = "集电线路图右侧 风机列表") @ApiOperation(value = "集电线路图右侧 风机列表")
@GetMapping("/fjList") @GetMapping("/fjList")
@Scheduled(cron = "0/10 * * * * ? ") @Scheduled(cron = "0/10 * * * * ? ")
public ResponseModel getListByFJ() { public ResponseModel<Object> getListByFJ() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
...@@ -515,7 +515,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -515,7 +515,7 @@ public class MonitorFanIdxController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "模拟量列表消息") @ApiOperation(value = "模拟量列表消息")
@GetMapping("/getAnalogQuantityInfo") @GetMapping("/getAnalogQuantityInfo")
public ResponseModel getAnalogQuantityInfo(@RequestParam(value = "stationId") String stationId, @RequestParam(value = "routeName") String routeName) { public ResponseModel<Object> getAnalogQuantityInfo(@RequestParam(value = "stationId") String stationId, @RequestParam(value = "routeName") String routeName) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId); StationBasic stationBasic = stationBasicMapper.selectById(stationId);
String gatewayId = stationBasic.getBoosterGatewayId(); String gatewayId = stationBasic.getBoosterGatewayId();
monitorFanIndicator.getAnalogQuantityInfo(gatewayId, stationBasic.getSequenceNbr().toString(), routeName); monitorFanIndicator.getAnalogQuantityInfo(gatewayId, stationBasic.getSequenceNbr().toString(), routeName);
...@@ -526,7 +526,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -526,7 +526,7 @@ public class MonitorFanIdxController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "升压站主屏消息接口") @ApiOperation(value = "升压站主屏消息接口")
@GetMapping("/getMajorAnalogQuantityByPage") @GetMapping("/getMajorAnalogQuantityByPage")
public ResponseModel getMajorAnalogQuantityByPage(@RequestParam(required = false) String stationId) { public ResponseModel<Object> getMajorAnalogQuantityByPage(@RequestParam(required = false) String stationId) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId); StationBasic stationBasic = stationBasicMapper.selectById(stationId);
String gatewayId = stationBasic.getBoosterGatewayId(); String gatewayId = stationBasic.getBoosterGatewayId();
if (stationBasic.getStationName().contains("夏造")) { if (stationBasic.getStationName().contains("夏造")) {
...@@ -579,7 +579,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -579,7 +579,7 @@ public class MonitorFanIdxController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "开关图片API/消息") @ApiOperation(value = "开关图片API/消息")
@GetMapping("/switchUrl") @GetMapping("/switchUrl")
public ResponseModel<Map<String, Object>> getElectricQuantityList( public ResponseModel<Object> getElectricQuantityList(
@RequestParam(value = "stationId") String stationId @RequestParam(value = "stationId") String stationId
) { ) {
...@@ -596,7 +596,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -596,7 +596,7 @@ public class MonitorFanIdxController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "动态面板页面消息") @ApiOperation(value = "动态面板页面消息")
@GetMapping("/pageTopic") @GetMapping("/pageTopic")
public ResponseModel<Map<String, Object>> sendPageTopic( public ResponseModel<Object> sendPageTopic(
@RequestParam(value = "stationId") String stationId, @RequestParam(value = "equipName") String equipName @RequestParam(value = "stationId") String stationId, @RequestParam(value = "equipName") String equipName
) { ) {
...@@ -779,7 +779,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -779,7 +779,7 @@ public class MonitorFanIdxController extends BaseController {
@ApiOperation(value = "箱变实时开关状态") @ApiOperation(value = "箱变实时开关状态")
@GetMapping("/equipSwitchStatus") @GetMapping("/equipSwitchStatus")
@Scheduled(cron = "0/10 * * * * ? ") @Scheduled(cron = "0/10 * * * * ? ")
public ResponseModel<Map<String, Object>> getEquipSwitchStatus() { public ResponseModel<Object> getEquipSwitchStatus() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
...@@ -853,7 +853,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -853,7 +853,7 @@ public class MonitorFanIdxController extends BaseController {
@ApiOperation(value = "集电线路图右侧 光伏列表") @ApiOperation(value = "集电线路图右侧 光伏列表")
@GetMapping("/gfList") @GetMapping("/gfList")
@Scheduled(cron = "0/10 * * * * ? ") @Scheduled(cron = "0/10 * * * * ? ")
public ResponseModel getListByNbq() { public ResponseModel<Object> getListByNbq() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment