代码更新2

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationController.java

@@ -226,10 +226,15 @@ public class WindpowerstationController {
     public R getList(
                       @RequestParam(value = "regionid",required = false) String regionid,
                       @RequestParam(value = "companyid",required = false) String companyid){
-        List<WindpowerstationAdmVo> list = windpowerstationService.getList(regionid,companyid);
-        if (null != list){
-            return R.ok().data(list);
-        }else {
+        try {
+            List<WindpowerstationAdmVo> list = windpowerstationService.getList(regionid,companyid);
+            if (null != list){
+                return R.ok().data(list);
+            }else {
+                return R.error().data("查询失败！");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
             return R.error().data("查询失败！");
         }
     }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindpowerstationService.java

@@ -30,7 +30,7 @@ public interface IWindpowerstationService extends IService<Windpowerstation> {
     List<Windpowerstation> getList(String companyid);
 
 
-    List<WindpowerstationAdmVo> getList(String regionid, String companyid);
+    List<WindpowerstationAdmVo> getList(String regionid, String companyid) throws Exception;
 
 
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/IndicatorsServiceImpl.java

@@ -31,8 +31,7 @@ import java.util.List;
 @Service
 public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicators> implements IIndicatorsService {
 
-    private RestTemplate restTemplate =new RestTemplate();
-    private static String baseURL = "http://10.81.3.152:8011/ts";
+
 
     @Autowired
     private EdosUtil goldenUtil;

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -11,11 +11,15 @@ import com.gyee.backconfig.model.auto.Windpowerstationpointnew;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.service.auto.RedisService;
+import com.gyee.backconfig.util.realtimedate.EdosUtil;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
+import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +38,9 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     @Resource
     private RedisService redisService;
 
+    @Autowired
+    private EdosUtil goldenUtil;
+
     @Override
     public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
 
@@ -98,7 +105,9 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     }
 
     @Override
-    public List<WindpowerstationAdmVo> getList(String regionid, String companyid) {
+    public List<WindpowerstationAdmVo> getList(String regionid, String companyid) throws Exception {
+
+        List<WindpowerstationAdmVo> admvos =  new ArrayList<>();
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(regionid)){
@@ -112,17 +121,37 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         List<Windpowerstation> list = baseMapper.selectList(qw);
 
         list.stream().forEach(i->{
+            List<String> codes = new ArrayList<>();
 //            RPJFS
 //            RFDL
             String wpString = redisService.get(i.getId());
             Map<String, Windpowerstationpointnew> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
 
             });
-            String rpjfs  = stringMapMap.get("RPJFS").getCode();
-            String rfdl = stringMapMap.get("RFDL").getCode();
+            codes.add(stringMapMap.get("RPJFS").getCode());//日平局风速
+            codes.add(stringMapMap.get("RFDL").getCode());//日发电量
+            try {
+                List<PointData> pointList = goldenUtil.getRealData(codes);
+                WindpowerstationAdmVo vo = new WindpowerstationAdmVo();
+                vo.setId(i.getId());
+                vo.setCode(i.getCode());
+                vo.setName(i.getName());
+                vo.setCapacity(i.getCapacity());//装机容量
+                vo.setCapacityunit(i.getCapacityunit());//装机容量单位
+                vo.setQuantity(i.getQuantity());//装机台数
+                vo.setModel(i.getModel());//机型
+                vo.setSystemmanufact(i.getSystemmanufact());//厂家
+                vo.setAddress(i.getAddress());//地址
+                vo.setRfdl(pointList.get(0).getPointValueInDouble());
+                vo.setRfdl(pointList.get(1).getPointValueInDouble());
+                admvos.add(vo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
         });
 
-        return null;
+        return admvos;
 
     }
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/vo/WindpowerstationAdmVo.java

@@ -7,15 +7,15 @@ import java.util.List;
 @Data
 public class WindpowerstationAdmVo {
 
+    private String id;
+
     private String code;
 
     private String name;
 
     private String address;
 
-    private String telephone;
-
-    private Integer capacity;
+    private double capacity;
 
     private String capacityunit;
 
@@ -23,32 +23,17 @@ public class WindpowerstationAdmVo {
 
     private String aname;
 
-    private Integer longitude;
-
-    private Integer latitude;
-
-    private String photo;
 
     private String companyid;
 
     private String systemmanufact;
 
-    private String headfarm;
-
-    private String headfarmphone;
 
     private String model;
 
-    private Integer ordernum;
-
-    private Integer altitude;
-
-    private Integer height;
+    private double rpjfs;
 
-    private Integer version;
+    private double rfdl;
 
-    private Integer current;
 
-    private Integer pagesize;
-    private List<Projectvo> data;
 }