等级评估接口调整

src/main/java/com/gyee/frame/controller/benchmarking/BenchmarkingController.java

@@ -16,8 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Controller
 @RequestMapping("/benchmarking")
@@ -86,20 +85,20 @@ public class BenchmarkingController {
     /**按等级评估ID查询相应信息返回玫瑰图**/
     @GetMapping("/wtchart")
     @ResponseBody
-    public AjaxResult wtchart(String gaid) {
+    public AjaxResult wtchart(String gaid1,String gaid2) {
 
 
-        if (StringUtils.isNotEmpty(gaid))
+        if (StringUtils.isNotEmpty(gaid1) && StringUtils.isNotEmpty(gaid2))
         {
-            List<ValueVo> ls=windturbineinfodaytop3Service.wtchart(gaid);
-
-            if( !ls.isEmpty())
-            {
-                return	AjaxResult.successData(AjaxStatus.success.code,ls);
-            }else
-            {
-                return	AjaxResult.successData(AjaxStatus.emptyresultset.code,ls);
-            }
+            List<ValueVo> ls1=windturbineinfodaytop3Service.wtchart(gaid1);
+            List<ValueVo> ls2=windturbineinfodaytop3Service.wtchart(gaid2);
+
+            Map<String,List<ValueVo>> map=new HashMap();
+
+            map.put(gaid1,ls1);
+            map.put(gaid2,ls2);
+
+            return	AjaxResult.successData(AjaxStatus.success.code,map);
         }
 
          return	AjaxResult.error(AjaxStatus.error.code,null);
@@ -108,20 +107,20 @@ public class BenchmarkingController {
     /**按等级评估ID查询相应详细信息**/
     @GetMapping("/wtinfo")
     @ResponseBody
-    public AjaxResult wtinfo(String gaid) {
+    public AjaxResult wtinfo(String gaid1,String gaid2) {
 
 
-        if (StringUtils.isNotEmpty(gaid))
+        if (StringUtils.isNotEmpty(gaid1) && StringUtils.isNotEmpty(gaid2))
         {
-            Windturbineinfodaytop3 wtd=windturbineinfodaytop3Service.selectByPrimaryKey(gaid);
-
-            if( null!=wtd)
-            {
-                return	AjaxResult.successData(AjaxStatus.success.code,wtd);
-            }else
-            {
-                return	AjaxResult.successData(AjaxStatus.emptyresultset.code,wtd);
-            }
+            Map<String,Windturbineinfodaytop3> map=new HashMap();
+
+            Windturbineinfodaytop3 wtd1=windturbineinfodaytop3Service.selectByPrimaryKey(gaid1);
+            Windturbineinfodaytop3 wtd2=windturbineinfodaytop3Service.selectByPrimaryKey(gaid2);
+
+            map.put(gaid1,wtd1);
+            map.put(gaid2,wtd2);
+
+            return	AjaxResult.successData(AjaxStatus.success.code,map);
         }
 
         return	AjaxResult.error(AjaxStatus.error.code,null);