逆变器DI点列表

src/main/java/com/gyee/frame/controller/monitor/MonitorInverterPushController.java

@@ -1,6 +1,7 @@
 package com.gyee.frame.controller.monitor;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -9,8 +10,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.google.common.collect.Maps;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.service.websocket.WtInfoPushService;
 import com.gyee.frame.service.websocket.WtWarnPushService;
 
@@ -34,18 +38,24 @@ public class MonitorInverterPushController {
 	@ApiOperation(value = "逆变器信息", notes = "逆变器AI点、报警点")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
 	public AjaxResult findWtInfo(String wtId) throws Exception {
-		List<Object> list = wtInfoPushService.findInverterInfo(wtId);
-		return AjaxResult.successData(AjaxStatus.success.code, list);
+		List<Object> listAI = wtInfoPushService.findInverterInfo(wtId);
+		Object listDI = wtInfoPushService.findInverterDI(wtId);
+		Windturbine wt = InitialRunner.wtmap.get(wtId);
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("listAI", listAI);
+		map.put("listDI", listDI);
+		map.put("info",wt);
+		return AjaxResult.successData(AjaxStatus.success.code, map);
 	}
 
-	@PostMapping("/findInverterDI")
-	@ResponseBody
-	@ApiOperation(value = "逆变器信息", notes = "逆变器AI点、报警点")
-	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
-	public AjaxResult findInverterDI(String wtId) throws Exception {
-		Object list = wtInfoPushService.findInverterDI(wtId);
-		return AjaxResult.successData(AjaxStatus.success.code, list);
-	}
+//	@PostMapping("/findInverterDI")
+//	@ResponseBody
+//	@ApiOperation(value = "逆变器信息", notes = "逆变器AI点、报警点")
+//	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
+//	public AjaxResult findInverterDI(String wtId) throws Exception {
+//		Object list = wtInfoPushService.findInverterDI(wtId);
+//		return AjaxResult.successData(AjaxStatus.success.code, list);
+//	}
 
 	@PostMapping("/findInverterPowerLine")
 	@ResponseBody