场站、项目、线路接口

src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -45,10 +45,13 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Windpowerstation>  wpmap = new HashMap<String, Windpowerstation>();
     public static Map<String, Warning>  warningmap = new HashMap<String, Warning>();
     public static Map<String, Project> pjmap = new HashMap<String, Project>(); // 项目MAP
+    public static Map<String, Line> lnmap = new HashMap<String, Line>(); // 线路
     public static Map<String, Windturbine>  wtmap = new HashMap<String, Windturbine>();
     public static Map<String, List<Windturbine>> wp_wtmap = new HashMap<String, List<Windturbine>>();
     public static Map<String, List<Windturbine>> pj_wtmap = new HashMap<String, List<Windturbine>>();
     public static Map<String, List<Windturbine>> ln_wtmap = new HashMap<String, List<Windturbine>>();
+    public static Map<String, List<Project>> pjsmap = new HashMap<String, List<Project>>(); // 通过风场编号获得所属项目
+    public static Map<String, List<Line>> lnsmap = new HashMap<String, List<Line>>(); // 通过项目编号获得所属线路
 
     public static Map<String, Map<String, WindTurbineTestingPointAi2>> wtpAimap = new HashMap<String, Map<String, WindTurbineTestingPointAi2>>();// 风电机测点AI表
     public static Map<String, Map<String, WindPowerStationTestingPoint2>> stationPointmap = new HashMap<String, Map<String, WindPowerStationTestingPoint2>>();//场站测点
@@ -95,6 +98,15 @@ public class InitialRunner implements CommandLineRunner {
         if (!pjls.isEmpty()) {
             for (Project pj : pjls) {
                 pjmap.put(pj.getId(), pj);
+                if (pjsmap.containsKey(pj.getWindpowerstationid())) {
+                    List<Project> pjls = pjsmap.get(pj.getWindpowerstationid());
+                    pjls.add(pj);
+                    pjsmap.put(pj.getWindpowerstationid(), pjls);
+                } else {
+                    List<Project> pjls = new ArrayList<Project>();
+                    pjls.add(pj);
+                    pjsmap.put(pj.getWindpowerstationid(), pjls);
+                }
             }
         }
 
@@ -103,6 +115,21 @@ public class InitialRunner implements CommandLineRunner {
         lineExample.createCriteria().getAllCriteria();
         linels= lineService.selectByExample(lineExample);
 
+        if (!linels.isEmpty()) {
+            for (Line ln : linels) {
+                lnmap.put(ln.getId(), ln);
+                if (lnsmap.containsKey(ln.getProjectid())) {
+                    List<Line> lnls = lnsmap.get(ln.getProjectid());
+                    lnls.add(ln);
+                    lnsmap.put(ln.getProjectid(), lnls);
+                } else {
+                    List<Line> lnls = new ArrayList<Line>();
+                    lnls.add(ln);
+                    lnsmap.put(ln.getProjectid(), lnls);
+                }
+            }
+        }
+
         WindturbineExample windturbineExample=new WindturbineExample();
         windturbineExample.setOrderByClause("id ASC");
         windturbineExample.createCriteria().andWindpowerstationidNotLike("%GDC");

src/main/java/com/gyee/frame/controller/contrast/ContrastController.java

@@ -6,6 +6,7 @@ import com.gyee.frame.model.custom.BenchMarkVo;
 import com.gyee.frame.model.custom.ConditionVo;
 import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.service.contrast.ContrastPjService;
 import com.gyee.frame.service.contrast.ContrastWpService;
 import com.gyee.frame.service.contrast.ContrastWtService;
 import com.gyee.frame.service.contrast.ContrastZjService;
@@ -31,6 +32,8 @@ public class ContrastController {
     @Resource
     private ContrastWpService contrastWpService;
     @Resource
+    private ContrastPjService contrastPjService;
+    @Resource
     private ContrastWtService contrastWtService;
     @Resource
     private ContrastZjService contrastZjService;
@@ -85,9 +88,32 @@ public class ContrastController {
         }
 
     }
+    /**
+     * 查询场内风机列表信息
+     **/
+    @PostMapping("/benchmarkWpInWtList")
+    @ResponseBody
+    public AjaxResult benchmarkWpInWtList(Tablepar tablepar, String wpId,String wtId, String beginDate, String endDate) {
+
+        List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId,beginDate, endDate);
+
+        if (vos != null && !vos.isEmpty()) {
+            BenchmarkUtil bu = new BenchmarkUtil();
+            vos = bu.getBenchMarkOrder(vos);
+            //默认综合排序，不需要从新排序，除非指定字段排序
+            if(StringUtils.notEmp(tablepar) && StringUtils.isNotEmpty(tablepar.getOrderByColumn()) )
+            {
+                vos = bu.getBenchMarkOrder(vos,tablepar);
+            }
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
 
     /**
-     * 查询场内对标列表信息
+     * 查询场际对标列表信息
      **/
     @PostMapping("/benchmarkWpOutList")
     @ResponseBody
@@ -113,7 +139,7 @@ public class ContrastController {
     }
 
     /**
-     * 查询等级评估日所有信息
+     * 查询场际对标图表
      **/
     @GetMapping("/findWpPowerOutChat")
     @ResponseBody
@@ -145,14 +171,17 @@ public class ContrastController {
         }
     }
 
+
     /**
-     * 查询风机列表信息
+     * 查询项目对标列表信息
      **/
-    @PostMapping("/benchmarkWtList")
+    @PostMapping("/benchmarkPjList")
     @ResponseBody
-    public AjaxResult benchmarkWtList(Tablepar tablepar, String wpId,String wtId, String beginDate, String endDate) {
+    public AjaxResult benchmarkPjList(Tablepar tablepar, String wpId,String pjId, String beginDate, String endDate) {
+
+        List<BenchMarkVo> vos =contrastPjService.benchmarkPjList(wpId,pjId, beginDate,  endDate);
+
 
-        List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId, beginDate,  endDate);
 
         if (vos != null && !vos.isEmpty()) {
             BenchmarkUtil bu = new BenchmarkUtil();
@@ -170,13 +199,33 @@ public class ContrastController {
     }
 
     /**
-     * 查询场内风机列表信息
+     * 查询项目对标图表
      **/
-    @PostMapping("/benchmarkWpInWtList")
+    @GetMapping("/findPjPowerChat")
     @ResponseBody
-    public AjaxResult benchmarkWpInWtList(Tablepar tablepar, String wpId,String wtId, String beginDate, String endDate) {
+    public AjaxResult findPjPowerChat(String wpId,String pjId, String beginDate, String endDate) throws Exception {
 
-        List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId,beginDate, endDate);
+
+        if(StringUtils.isNotEmpty(wpId) && StringUtils.isNotEmpty(beginDate)  && StringUtils.isNotEmpty(endDate))
+        {
+
+        }
+        List<DataVo> vos = contrastPjService.findPjPowerChat(wpId,pjId, beginDate, endDate);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+    }
+    /**
+     * 查询风机列表信息
+     **/
+    @PostMapping("/benchmarkWtList")
+    @ResponseBody
+    public AjaxResult benchmarkWtList(Tablepar tablepar, String wpId,String wtId, String beginDate, String endDate) {
+
+        List<BenchMarkVo> vos =contrastWtService.benchmarkWtList(wpId,wtId, beginDate,  endDate);
 
         if (vos != null && !vos.isEmpty()) {
             BenchmarkUtil bu = new BenchmarkUtil();
@@ -194,6 +243,8 @@ public class ContrastController {
     }
 
 
+
+
     /**
      * 新增值际对标
      **/

src/main/java/com/gyee/frame/controller/powercompare/PowerCompareController.java

@@ -2,8 +2,9 @@ package com.gyee.frame.controller.powercompare;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.model.auto.Windpowerinfoday3;
-import com.gyee.frame.model.auto.Windturbineinfoday3;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.StopTypeTreeVo;
 import com.gyee.frame.service.Windpowerinfoday3Service;
 import com.gyee.frame.service.Windturbineinfoday3Service;
 import com.gyee.frame.util.DateUtils;
@@ -15,10 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Controller
 @RequestMapping("/powercompare")
@@ -29,6 +27,87 @@ public class PowerCompareController {
     private Windturbineinfoday3Service windturbineinfoday3Service;
 
 
+    @GetMapping("/windfarmAjax")
+    @ResponseBody
+    @CrossOrigin
+    public AjaxResult windfarmAjax() {
+        List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
+        for (Windpowerstation station : InitialRunner.wpls) {
+            if (station.getId().endsWith("FDC")) {
+                StopTypeTreeVo vo = new StopTypeTreeVo();
+                vo.setId(station.getId());
+                vo.setName(station.getName());
+                vo.setpId("0");
+                vos.add(vo);
+            }
+        }
+        if(vos !=null && !vos.isEmpty())
+        {
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
+        }else
+        {
+            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+        }
+    }
+
+
+    @GetMapping("/projectAjax")
+    @ResponseBody
+    @CrossOrigin
+    public AjaxResult projectAjax(String wpIds) {
+        List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
+        if (StringUtils.notEmp(wpIds)) {
+            String[] ids = wpIds.split(",");
+            // String pids = "";
+
+            for (String id : ids) {
+                for (Project project : InitialRunner.pjsmap.get(id)) {
+
+                    StopTypeTreeVo vo = new StopTypeTreeVo();
+                    vo.setId(project.getId());
+                    vo.setName(project.getName());
+                    vo.setpId("0");
+                    vos.add(vo);
+                }
+            }
+        }
+        if(vos !=null && !vos.isEmpty())
+        {
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
+        }else
+        {
+            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+        }
+    }
+
+    @GetMapping("/lineAjax")
+    @ResponseBody
+    @CrossOrigin
+    public AjaxResult lineAjax(String pjIds) {
+        List<StopTypeTreeVo> vos = new ArrayList<StopTypeTreeVo>();
+        if (StringUtils.notEmp(pjIds)) {
+            String[] ids = pjIds.split(",");
+            // String pids = "";
+
+            for (String id : ids) {
+                for (Line line : InitialRunner.lnsmap.get(id)) {
+
+                    StopTypeTreeVo vo = new StopTypeTreeVo();
+                    vo.setId(line.getId());
+                    vo.setName(line.getName());
+                    vo.setpId("0");
+                    vos.add(vo);
+                }
+            }
+        }
+        if(vos !=null && !vos.isEmpty())
+        {
+            return	AjaxResult.successData(AjaxStatus.success.code,vos);
+        }else
+        {
+            return	AjaxResult.successData(AjaxStatus.emptyresultset.code,vos);
+        }
+    }
     /**查询风机图表数据结果**/
     @GetMapping("/queryPower")
     @ResponseBody

src/main/java/com/gyee/frame/model/custom/StopTypeTreeVo.java

@@ -0,0 +1,26 @@
+package com.gyee.frame.model.custom;
+
+public class StopTypeTreeVo {
+	private String id;
+	private String pId;
+	private String name;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getpId() {
+		return pId;
+	}
+	public void setpId(String pId) {
+		this.pId = pId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

src/main/java/com/gyee/frame/service/contrast/ContrastPjService.java

@@ -3,6 +3,7 @@ package com.gyee.frame.service.contrast;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.BenchMarkVo;
+import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.service.FaultEliminateDefectsService;
 import com.gyee.frame.service.StatetransitionratesService;
 import com.gyee.frame.service.Windpowerinfoday3Service;
@@ -290,4 +291,118 @@ public class ContrastPjService {
 		}
 		return vos;
 	}
+
+	public List<DataVo> findPjPowerChat(String wpId,String pjId, String beginDate, String endDate) {
+
+		Date begin = DateUtils.parseDate(beginDate);
+		Date end = DateUtils.parseDate(endDate);
+
+		List<DataVo> vos = new ArrayList<DataVo>();
+		List<String> wpids = new ArrayList<String>();
+		if (StringUtils.notEmp(wpId)) {
+			if (wpId.indexOf(",") != -1) {
+				String[] strs = wpId.split(",");
+				if (strs.length > 0) {
+					for (int i = 0; i < strs.length; i++) {
+						wpids.add(strs[i]);
+					}
+				}
+			} else {
+				wpids.add(wpId);
+			}
+		}
+
+		List<String> pjids = new ArrayList<String>();
+		if (StringUtils.notEmp(pjId)) {
+			if (pjId.indexOf(",") != -1) {
+				String[] strs = pjId.split(",");
+				if (strs.length > 0) {
+					for (int i = 0; i < strs.length; i++) {
+						pjids.add(strs[i]);
+					}
+				}
+			} else {
+				pjids.add(pjId);
+			}
+		}
+		List<Windpowerinfoday3> ls =null;
+		if (!pjids.isEmpty()) {
+			ls =windpowerinfoday3Service.getWindpowerinfoday3(pjids, begin, end, "project");
+		} else if (!wpids.isEmpty()) {
+			ls =windpowerinfoday3Service.getWindpowerinfoday3(wpids, begin, end, "windpower");
+		}
+		// Map<String, Windpowerstation> wpmap = CacheContext.wpmap;
+		Map<String, Project> pjmap = InitialRunner.pjmap;
+		Map<String, DataVo> vomap = new HashMap<String, DataVo>();
+		if (!ls.isEmpty()) {
+			for (int i = 0; i < ls.size(); i++) {
+				Windpowerinfoday3 wd = ls.get(i);
+				if (vomap.containsKey(wd.getProjectid())) {
+					DataVo vo = vomap.get(wd.getProjectid());
+					double losspower1 = null != wd.getDaynhxdssdl2() ? wd.getDaynhxdssdl2() : 0.0;
+					double losspower2 = null != wd.getDaynhgzssdl2() ? wd.getDaynhgzssdl2() : 0.0;
+					double losspower3 = null != wd.getDaynhwhssdl2() ? wd.getDaynhwhssdl2() : 0.0;
+					double losspower4 = null != wd.getDaynhqfdl2() ? wd.getDaynhqfdl2() : 0.0;
+					double fdl = null != wd.getDaydl2() ? wd.getDaydl2() : 0.0;
+
+					vo.setValue1(vo.getValue1() + losspower1);// 限电损失
+					vo.setValue2(vo.getValue2() + losspower2);// 故障损失
+					vo.setValue3(vo.getValue3() + losspower3);// 维护损失
+					vo.setValue4(vo.getValue4() + losspower4);// 欠发损失
+					vo.setValue5(0.0);// 受累损失
+					vo.setValue6(vo.getValue6() + fdl);// 发电量
+					vomap.put(wd.getProjectid(), vo);
+				} else {
+					DataVo vo = new DataVo();
+
+					vo.setValue1(null != wd.getDaynhxdssdl2() ? wd.getDaynhxdssdl2() : 0.0);// 限电损失
+					vo.setValue2(null != wd.getDaynhgzssdl2() ? wd.getDaynhgzssdl2() : 0.0);// 故障损失
+					vo.setValue3(null != wd.getDaynhwhssdl2() ? wd.getDaynhwhssdl2() : 0.0);// 维护损失
+					vo.setValue4(null != wd.getDaynhqfdl2() ? wd.getDaynhqfdl2() : 0.0);// 欠发损失
+
+					vo.setValue5(0.0);// 受累损失
+					vo.setValue6(null != wd.getDaydl2() ? (new BigDecimal(wd.getDaydl2()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).doubleValue()) : 0.0);// 发电量
+
+					// vo.setValue7(null != wd.getGridelectricity() ?
+					// wd.getGridelectricity() : 0.0);// 上网电量
+					// vo.setValue8(null != wd.getBuyelectricity() ?
+					// wd.getBuyelectricity() : 0.0);// 购网电量
+
+					vo.setTime(DateUtils.truncate(DateUtils.addDays(wd.getRecorddate(), 1)).getTime());
+
+					if (pjmap.containsKey(wd.getProjectid())) {
+						Project pj = pjmap.get(wd.getProjectid());
+						vo.setName(pj.getName());
+
+					}
+					// if(wpmap.containsKey(wd.getWindpowerstationid()))
+					// {
+					// Windpowerstation
+					// wp=wpmap.get(wd.getWindpowerstationid());
+					// vo.setName(wp.getName());
+					// }
+					vomap.put(wd.getProjectid(), vo);
+				}
+
+			}
+			Set<Map.Entry<String, DataVo>> set = vomap.entrySet();
+			for (Iterator<Map.Entry<String, DataVo>> it = set.iterator(); it.hasNext();) {
+				Map.Entry<String, DataVo> entry = (Map.Entry<String, DataVo>) it.next();
+				// System.out.println(entry.getKey() + "--->" +
+				// entry.getValue());
+				DataVo vo = entry.getValue();
+				vo.setValue1(new BigDecimal(vo.getValue1()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+				vo.setValue2(new BigDecimal(vo.getValue2()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+				vo.setValue3(new BigDecimal(vo.getValue3()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+				vo.setValue4(new BigDecimal(vo.getValue4()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+				vo.setValue5(StringUtils.round(vo.getValue5(), 2));
+				vo.setValue6(new BigDecimal(vo.getValue6()).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+				// vo.setValue7(StringUtils.round(vo.getValue7(), 2));
+				// vo.setValue8(StringUtils.round(vo.getValue8(), 2));
+				vos.add(vo);
+			}
+		}
+
+		return vos;
+	}
 }

src/test/java/test/ContrastTest.java

@@ -33,7 +33,7 @@ public class ContrastTest {
 
         Date beginDate = c.getTime();
 
-        String wpid="MHS_FDC";
+        String wpid=null;
 
         ContrastController contrastController= SpringUtils.getBean("contrastController");
 //
@@ -45,14 +45,14 @@ public class ContrastTest {
         tablepar.setPageNum(1);
         tablepar.setPageSize(10);
 
-//        AjaxResult ajaxResult = contrastController.benchmarkLossList(tablepar,wpid,"2021-01-01 00:00:00","2021-01-04 00:00:00");
-//
-//        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
-//        for(BenchMarkVo wtd:test)
-//        {
-//            System.out.println(wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
-//        }
-        //System.out.println(test);
+        AjaxResult ajaxResult = contrastController.benchmarkLossList(tablepar,wpid,"2021-01-01 00:00:00","2021-01-04 00:00:00");
+
+        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
+        for(BenchMarkVo wtd:test)
+        {
+            System.out.println(wtd.getDxklylnum()+"----------------"+wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
+        }
+        System.out.println(test);
 
 //        AjaxResult ajaxResult = contrastController.findWpPowerOutChat(wpid,"2021-01-01 00:00:00","2021-01-04 00:00:00");
 //        List<DataVo> test=(List<DataVo>)ajaxResult.get("data");
@@ -61,14 +61,14 @@ public class ContrastTest {
 //            System.out.println(wtd.getValue1()+"----------------"+wtd.getValue2());
 //        }
 
-        AjaxResult ajaxResult = contrastController.benchmarkWtList(tablepar,wpid,null,"2021-01-01 00:00:00","2021-01-04 00:00:00");
-
-        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
-        for(BenchMarkVo wtd:test)
-        {
-            System.out.println(wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
-        }
-        System.out.println(test);
+//        AjaxResult ajaxResult = contrastController.benchmarkWtList(tablepar,wpid,null,"2021-01-01 00:00:00","2021-01-04 00:00:00");
+//
+//        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
+//        for(BenchMarkVo wtd:test)
+//        {
+//            System.out.println(wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
+//        }
+//        System.out.println(test);
     }
 
 

src/test/java/test/PowercompareTest.java

@@ -4,7 +4,7 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.powercompare.PowerCompareController;
-import com.gyee.frame.model.auto.Windpowerinfoday3;
+import com.gyee.frame.model.custom.StopTypeTreeVo;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
@@ -43,14 +43,39 @@ public class PowercompareTest {
         tablepar.setPageSize(10);
 
 
-        AjaxResult ajaxResult = powerCompareController.powerAjaxAll("MHS_FDC","2021-01-01","2021-01-03","xl",null,null);
+//        AjaxResult ajaxResult = powerCompareController.powerAjaxAll("MHS_FDC","2021-01-01","2021-01-03","xl",null,null);
+//
+//        List<Windpowerinfoday3> test=(List<Windpowerinfoday3>)ajaxResult.get("data");
+//        for(Windpowerinfoday3 wtd:test)
+//        {
+//            System.out.println(wtd.getLineid()+"----------------"+wtd.getLocation());
+//        }
+//        System.out.println(test);
 
-        List<Windpowerinfoday3> test=(List<Windpowerinfoday3>)ajaxResult.get("data");
-        for(Windpowerinfoday3 wtd:test)
+        AjaxResult ajaxResult3 = powerCompareController.windfarmAjax();
+
+        List<StopTypeTreeVo> test3=(List<StopTypeTreeVo>)ajaxResult3.get("data");
+        for(StopTypeTreeVo wtd:test3)
+        {
+            System.out.println(wtd.getId()+"----------------"+wtd.getName());
+        }
+
+
+        AjaxResult ajaxResult = powerCompareController.projectAjax("MHS_FDC");
+
+        List<StopTypeTreeVo> test=(List<StopTypeTreeVo>)ajaxResult.get("data");
+        for(StopTypeTreeVo wtd:test)
         {
-            System.out.println(wtd.getLineid()+"----------------"+wtd.getLocation());
+            System.out.println(wtd.getId()+"----------------"+wtd.getName());
         }
-        System.out.println(test);
+
+        AjaxResult ajaxResult2 = powerCompareController.lineAjax("MHS01_GC");
+        List<StopTypeTreeVo> test2=(List<StopTypeTreeVo>)ajaxResult2.get("data");
+        for(StopTypeTreeVo wtd:test2)
+        {
+            System.out.println(wtd.getId()+"----------------"+wtd.getName());
+        }
+
     }