代码优化2

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/base/WindInfoController.java

@@ -4,13 +4,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.power.fitting.common.result.JsonResult;
 import com.gyee.power.fitting.common.result.ResultCode;
 import com.gyee.power.fitting.common.spring.InitialRunner;
-import com.gyee.power.fitting.model.ProBasicEquipment;
-import com.gyee.power.fitting.model.ProBasicPowerstation;
+import com.gyee.power.fitting.model.*;
+import com.gyee.power.fitting.service.ProEconPowerFittingAnalySisService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -21,6 +24,10 @@ import java.util.List;
 @RequestMapping("/base")
 public class WindInfoController {
 
+
+    @Autowired
+    private ProEconPowerFittingAnalySisService powerService;
+
     @GetMapping("station")
     public JSONObject getStation() {
         List<ProBasicPowerstation> list = InitialRunner.wpNewList;
@@ -46,4 +53,27 @@ public class WindInfoController {
     }
 
 
+
+    /**
+     * 获取风机经纬度信息
+     * @param ids
+     * @return
+     */
+    @GetMapping("location")
+    public JSONObject dataLocation(String ids){
+        List<ProBasicEquipment> result = new ArrayList<>();
+        List<ProEconPowerFittingAnalySis> list = powerService.listByIds(Arrays.asList(ids.split(",")));
+        for (ProEconPowerFittingAnalySis obj : list){
+            String[] pids = obj.getProcessid().split(",");
+            for (String id : pids){
+                ProEconPowerFittingAnalySis item = powerService.getById(id);
+                ProBasicEquipment wt = InitialRunner.wtNewMap.get(item.getWindturbineId());
+                wt.setProcessId(id);
+                wt.setFittingId(obj.getId());
+                result.add(wt);
+            }
+        }
+        return JsonResult.successData(ResultCode.SUCCESS, result);
+    }
+
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/ProBasicEquipment.java

@@ -1,5 +1,6 @@
 package com.gyee.power.fitting.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
@@ -144,6 +145,14 @@ public class ProBasicEquipment extends Model<ProBasicEquipment> {
     private String substationId;
 
 
+    @TableField(exist = false)
+    private String prepareId;
+    @TableField(exist = false)
+    private String processId;
+    @TableField(exist = false)
+    private String fittingId;
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;