杨总数据api 场站数据crud

neim-biz/src/main/java/com/jiayue/biz/api/apiHDY.java

@@ -0,0 +1,33 @@
+package com.jiayue.biz.api;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.digest.HMac;
+import cn.hutool.crypto.digest.HmacAlgorithm;
+import cn.hutool.http.HttpUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class apiHDY {
+
+//    private static final String KEY = "dcforitilapi321";
+
+    private static final String DC_GET_ACCURACY_COMPARE = "http://10.124.241.4/curl/sctj/post.php";
+
+    public String jsonY(String time){
+        Map<String, Object> multiValueMap = new HashMap<>();
+        multiValueMap.put("rq", time);
+        //签名密钥
+//        byte[] key = KEY.getBytes();
+        // TODO 此处有问题，执行卡顿3分钟
+        HMac mac = new HMac(HmacAlgorithm.HmacMD5);
+        //拼接签名元数据
+        multiValueMap.put("sign", mac.digestHex(StrUtil.builder(time).toString()));
+        String resultStr = HttpUtil.get(DC_GET_ACCURACY_COMPARE, multiValueMap);
+        return resultStr;
+    }
+
+
+}

neim-biz/src/main/java/com/jiayue/biz/controller/ElectricStationController.java

@@ -1,7 +1,9 @@
 package com.jiayue.biz.controller;
 
 import com.jiayue.biz.domain.ElectricStation;
+import com.jiayue.biz.dto.StationInfoDto;
 import com.jiayue.biz.service.ElectricStationService;
+import com.jiayue.biz.service.StationInfoService;
 import com.jiayue.common.core.controller.BaseController;
 import com.jiayue.common.core.domain.AjaxResult;
 import lombok.AllArgsConstructor;
@@ -14,26 +16,32 @@ import org.springframework.web.bind.annotation.*;
 public class ElectricStationController extends BaseController {
     private final ElectricStationService electricStationService;
 
+
+    private final StationInfoService stationInfoService;
+
     @GetMapping("/selectElectricStation")
     public AjaxResult selectElectricStation(){
-        return AjaxResult.success(electricStationService.selectAllElectricStation());
+        return AjaxResult.success(stationInfoService.selectStationInfoDto());
     }
 
 
     @DeleteMapping
-    public AjaxResult delElectricStation(@RequestBody ElectricStation electricStation){
-        return AjaxResult.success(electricStationService.delElectricStation(electricStation)) ;
+    public AjaxResult delElectricStation(@RequestBody StationInfoDto stationInfoDto){
+        stationInfoService.delStationInfo(stationInfoDto);
+        return AjaxResult.success("200") ;
     }
 
     @PutMapping
-    public AjaxResult updateElectricStation(@RequestBody ElectricStation electricStation){
-        return AjaxResult.success(electricStationService.updateElectricStation(electricStation)) ;
+    public AjaxResult updateElectricStation(@RequestBody StationInfoDto stationInfoDto){
+        stationInfoService.updateStationInfo(stationInfoDto);
+        return AjaxResult.success("200") ;
     }
 
 
     @PostMapping
-    public AjaxResult saveElectricStation(@RequestBody ElectricStation electricStation){
-        return AjaxResult.success(electricStationService.saveElectricStation(electricStation)) ;
+    public AjaxResult saveElectricStation(@RequestBody StationInfoDto stationInfoDto){
+        stationInfoService.saveStationInfo(stationInfoDto);
+        return AjaxResult.success("200") ;
     }
 
 }

neim-biz/src/main/java/com/jiayue/biz/domain/StationBasicInfo.java

@@ -2,11 +2,13 @@ package com.jiayue.biz.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 场站基本信息
  */
 @AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class StationBasicInfo {
     private String stationName;

neim-biz/src/main/java/com/jiayue/biz/domain/StationInfo.java

@@ -2,6 +2,7 @@ package com.jiayue.biz.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @Document("station_info")
 public class StationInfo {
     private String id;

neim-biz/src/main/java/com/jiayue/biz/dto/StationInfoDto.java

@@ -0,0 +1,26 @@
+package com.jiayue.biz.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StationInfoDto {
+    private String id;
+    //场站名称
+    private String stationName;
+    //简称
+    private String abbreviation;
+    //场站id
+    private String stationId;
+    //场站类型
+    private String stationType;
+    //经度
+    private String longitude;
+    //纬度
+    private String latitude;
+    //关联设备
+    private String equipment;
+}

neim-biz/src/main/java/com/jiayue/biz/job/AirDensityJob.java

@@ -1,21 +1,19 @@
 package com.jiayue.biz.job;
 
-import cn.hutool.core.date.DateTime;
+
 import cn.hutool.db.Entity;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.jiayue.biz.api.apiHDY;
 import com.jiayue.biz.domain.*;
-import com.jiayue.biz.mapper.ProphaseAnemometryDataMapper;
 import com.jiayue.biz.service.*;
 import com.jiayue.biz.service.impl.*;
 import com.jiayue.biz.util.CalculationUtil;
 import com.jiayue.biz.util.DateTimeUtil;
 import com.jiayue.common.utils.DateUtil;
-import io.undertow.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -23,7 +21,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -44,7 +41,6 @@ public class AirDensityJob {
 
     private final StatisticsSituationServiceImpl statisticsSituationService;
 
-    private final WindTowerDataParentTableService windTowerDataParentTableService;
 
     private final ProphaseAnemometryDataService prophaseAnemometryDataService;
 
@@ -55,6 +51,8 @@ public class AirDensityJob {
 
     private final MongoTemplate mongoTemplate;
 
+    private final com.jiayue.biz.api.apiHDY apiHDY;
+
 
     @Scheduled(cron = "0 0 15 * * ?")
     public void AirDensityCalculation() {
@@ -216,7 +214,7 @@ public class AirDensityJob {
 
     //存储杨总数据 TODO 缺少TD Engine 逻辑
     public void saveJsonY() {
-        String s = "";
+        String s = apiHDY.jsonY(DateUtil.format(new Date(),"yyyyMMdd"));
         List<StationInfo> stationInfos = stationInfoService.selectStationInfo();
         for (StationInfo stationInfo : stationInfos) {
             JSONObject jsonObject = JSONUtil.parseObj(s);

neim-biz/src/main/java/com/jiayue/biz/service/StationInfoService.java

@@ -1,10 +1,25 @@
 package com.jiayue.biz.service;
 
 import com.jiayue.biz.domain.StationInfo;
+import com.jiayue.biz.dto.StationInfoDto;
 
 import java.util.List;
 
 public interface StationInfoService {
     //查询场站信息
     List<StationInfo> selectStationInfo();
+
+    //场站管理---查询
+    List<StationInfoDto> selectStationInfoDto();
+
+    //更新
+    void updateStationInfo(StationInfoDto stationInfoDto);
+
+    //保存
+    void saveStationInfo(StationInfoDto stationInfoDto);
+
+
+    //删除
+   void delStationInfo(StationInfoDto stationInfoDto);
+
 }

neim-biz/src/main/java/com/jiayue/biz/service/impl/ProjectServiceImpl.java

@@ -127,7 +127,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         projectInfo.setProjectBasicInfo(projectBasicInfo);
 
         if (projectDto.getEquipment() != null && !projectDto.getEquipment().equals("")) {
-            List<Equipment> equipment = getEquipment(windTowerInfoList, projectDto.getEquipment());
+            List<Equipment> equipment = CalculationUtil.getEquipment(windTowerInfoList, projectDto.getEquipment());
             projectInfo.setEquipment(equipment);
         }
 
@@ -148,7 +148,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         this.getProjectBasicInfo(projectBasicInfo, projectDto);
 
         if (projectDto.getEquipment() != null && !projectDto.getEquipment().equals("")) {
-            List<Equipment> equipment = getEquipment(windTowerInfoList, projectDto.getEquipment());
+            List<Equipment> equipment = CalculationUtil.getEquipment(windTowerInfoList, projectDto.getEquipment());
             projectInfo.setEquipment(equipment);
         }
         ArrayList<List<Coordinates>> cooList = new ArrayList<>();
@@ -179,37 +179,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
 
-    public List<Equipment> getEquipment(List<WindTowerInfo> windTowerInfoList, String equipmentStr) {
-        List<Equipment> equipmentList = new ArrayList<>();
-        String[] equipmentArr = equipmentStr.split(",");
-        for (String equipmentName : equipmentArr) {
-            List<WindTowerInfo> collect = windTowerInfoList.stream().filter(w -> w.getName().equals(equipmentName) || w.getEquipmentNo().equals(CalculationUtil.getNumberFromString(equipmentName))).collect(Collectors.toList());
-            if (collect.size() > 0) {
-                WindTowerInfo windTowerInfo = collect.get(0);
-                Equipment equipment = new Equipment();
-                equipment.setEquipmentNo(windTowerInfo.getEquipmentNo());
-                equipment.setId(windTowerInfo.getId());
-                equipment.setLatitude(windTowerInfo.getLatitude().toString());
-                equipment.setLongitude(windTowerInfo.getLongitude().toString());
-                equipment.setAltitude(windTowerInfo.getAltitude());
-                equipment.setHeights(windTowerInfo.getHeights());
-                equipment.setDisplayHeight(windTowerInfo.getDisplayHeight());
-                equipment.setInstallationTime(windTowerInfo.getInstallationTime() != null ? DateUtil.format(windTowerInfo.getInstallationTime(), "yyyy-MM-dd") : "");
-                equipment.setManufacturer(windTowerInfo.getManufacturer());
-                equipment.setModelNumber(windTowerInfo.getModelNumber());
-                equipment.setWdHeights(windTowerInfo.getWdHeights());
-                equipment.setType(windTowerInfo.getType());
-                equipment.setStatus(windTowerInfo.getStatus());
-                equipment.setPassword(windTowerInfo.getPassword());
-                equipment.setName(windTowerInfo.getName());
-                equipment.setRecorderNo(windTowerInfo.getRecorderNo());
-                equipment.setTerrainComplexity(windTowerInfo.getTerrainComplexity());
-                equipmentList.add(equipment);
-            }
-        }
-        return equipmentList;
-
-    }
 
     public void getProjectBasicInfo(ProjectBasicInfo projectBasicInfo, ProjectDto projectDto) {
         projectBasicInfo.setProjectName(projectDto.getProjectName());

neim-biz/src/main/java/com/jiayue/biz/service/impl/StationInfoServiceImpl.java

@@ -1,34 +1,141 @@
 package com.jiayue.biz.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.jiayue.biz.domain.Equipment;
+import com.jiayue.biz.domain.StationBasicInfo;
 import com.jiayue.biz.domain.StationInfo;
+import com.jiayue.biz.domain.WindTowerInfo;
+import com.jiayue.biz.dto.StationInfoDto;
 import com.jiayue.biz.service.StationInfoService;
+import com.jiayue.biz.service.WindTowerInfoService;
+import com.jiayue.biz.util.CalculationUtil;
+import com.jiayue.common.utils.DateUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
 public class StationInfoServiceImpl implements StationInfoService {
     private final MongoTemplate mongoTemplate;
 
+    private final WindTowerInfoService windTowerInfoService;
+
     //新增场站信息
-    public void saveStation(StationInfo stationInfo){
+    public void saveStation(StationInfo stationInfo) {
         mongoTemplate.save(stationInfo);
     }
 
+
+    public StationInfo getOneStationInfo(String id) {
+        return mongoTemplate.findOne(new Query(Criteria.where("_id").is(id)), StationInfo.class);
+    }
+
     //查询场站信息
-    public List<StationInfo> selectStationInfo(){
+    public List<StationInfo> selectStationInfo() {
         Query query = new Query();
-        return mongoTemplate.find(query,StationInfo.class);
+        return mongoTemplate.find(query, StationInfo.class);
+
+    }
+    //删除
+    public void del(String id){
+        mongoTemplate.remove(new Query(Criteria.where("_id").is(id)),StationInfo.class);
+    }
+
+
+    //场站管理---查询
+    public List<StationInfoDto> selectStationInfoDto() {
+        List<StationInfo> stationInfos = this.selectStationInfo();
+        ArrayList<StationInfoDto> list = new ArrayList<>();
+        for (StationInfo stationInfo : stationInfos) {
+            StationInfoDto stationInfoDto = new StationInfoDto();
+            stationInfoDto.setId(stationInfo.getId());
+            if (stationInfo.getStationBasicInfo() != null) {
+                stationInfoDto.setStationId(stationInfo.getStationBasicInfo().getStationId());
+                stationInfoDto.setStationName(stationInfo.getStationBasicInfo().getStationName());
+                stationInfoDto.setStationType(stationInfo.getStationBasicInfo().getStationType());
+                stationInfoDto.setAbbreviation(stationInfo.getStationBasicInfo().getAbbreviation());
+                stationInfoDto.setLatitude(stationInfo.getStationBasicInfo().getLatitude());
+                stationInfoDto.setLongitude(stationInfo.getStationBasicInfo().getLongitude());
+            }
+            if (stationInfo.getEquipment() != null) {
+                StringBuilder builder = new StringBuilder();
+                List<String> collect = stationInfo.getEquipment().stream().map(Equipment::getName).collect(Collectors.toList());
+                for (String s : collect) {
+                    builder.append(s).append(",");
+                }
+                if (builder.length() > 0) {
+                    builder.delete(builder.length() - 1, builder.length());
+                }
+
+                stationInfoDto.setEquipment(builder.toString());
+            }
+            list.add(stationInfoDto);
+
+        }
+        return list;
 
     }
+    //删除
+    public void delStationInfo(StationInfoDto stationInfoDto){
+        this.del(stationInfoDto.getId());
+    }
+
+
+    //保存
+    public void saveStationInfo(StationInfoDto stationInfoDto){
+        List<WindTowerInfo> list = windTowerInfoService.list();
+        stationInfoDto.setId(UUID.randomUUID().toString());
+        StationInfo stationInfo = new StationInfo();
+        StationBasicInfo stationBasicInfo = this.getStationBasicInfo(stationInfoDto);
+        stationInfo.setStationBasicInfo(stationBasicInfo);
+        if (stationInfoDto.getEquipment() != null && !stationInfoDto.getEquipment().equals("")) {
+            List<Equipment> equipment = CalculationUtil.getEquipment(list, stationInfoDto.getEquipment());
+            stationInfo.setEquipment(equipment);
+        }
 
+        this.saveStation(stationInfo);
+
+    }
+
+
+    //更新
+    public void updateStationInfo(StationInfoDto stationInfoDto) {
+        List<WindTowerInfo> list = windTowerInfoService.list();
+        StationInfo stationInfo = getOneStationInfo(stationInfoDto.getId());
+        StationBasicInfo stationBasicInfo = this.getStationBasicInfo(stationInfoDto);
+        stationInfo.setStationBasicInfo(stationBasicInfo);
+        if (stationInfoDto.getEquipment() != null && !stationInfoDto.getEquipment().equals("")) {
+            List<Equipment> equipment = CalculationUtil.getEquipment(list, stationInfoDto.getEquipment());
+            stationInfo.setEquipment(equipment);
+        }
+
+        this.saveStation(stationInfo);
+
+
+
+    }
+
+
+    //组装数据
+    public StationBasicInfo getStationBasicInfo(StationInfoDto stationInfoDto) {
+        StationBasicInfo stationBasicInfo = new StationBasicInfo();
+        stationBasicInfo.setStationId(stationInfoDto.getStationId());
+        stationBasicInfo.setStationName(stationInfoDto.getStationName());
+        stationBasicInfo.setAbbreviation(stationInfoDto.getAbbreviation());
+        stationBasicInfo.setLatitude(stationInfoDto.getLatitude());
+        stationBasicInfo.setLongitude(stationInfoDto.getLongitude());
+        stationBasicInfo.setStationType(stationInfoDto.getStationType());
+        return stationBasicInfo;
+
+    }
 
 
 

neim-biz/src/main/java/com/jiayue/biz/util/CalculationUtil.java

@@ -1,10 +1,9 @@
 package com.jiayue.biz.util;
 
 import cn.hutool.core.convert.Convert;
-import com.jiayue.biz.domain.ProphaseAnemometryData;
-import com.jiayue.biz.domain.ProphaseWeatherData;
-import com.jiayue.biz.domain.WindTowerCalculationData;
+import com.jiayue.biz.domain.*;
 import com.jiayue.biz.eunms.WindDirectionEnum;
+import com.jiayue.common.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
 
@@ -386,5 +385,37 @@ public class CalculationUtil {
         return sumWShear;
     }
 
+    //测风塔mysql与mongo转换
+    public static List<Equipment> getEquipment(List<WindTowerInfo> windTowerInfoList, String equipmentStr) {
+        List<Equipment> equipmentList = new ArrayList<>();
+        String[] equipmentArr = equipmentStr.split(",");
+        for (String equipmentName : equipmentArr) {
+            List<WindTowerInfo> collect = windTowerInfoList.stream().filter(w -> w.getName().equals(equipmentName) || w.getEquipmentNo().equals(CalculationUtil.getNumberFromString(equipmentName))).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                WindTowerInfo windTowerInfo = collect.get(0);
+                Equipment equipment = new Equipment();
+                equipment.setEquipmentNo(windTowerInfo.getEquipmentNo());
+                equipment.setId(windTowerInfo.getId());
+                equipment.setLatitude(windTowerInfo.getLatitude().toString());
+                equipment.setLongitude(windTowerInfo.getLongitude().toString());
+                equipment.setAltitude(windTowerInfo.getAltitude());
+                equipment.setHeights(windTowerInfo.getHeights());
+                equipment.setDisplayHeight(windTowerInfo.getDisplayHeight());
+                equipment.setInstallationTime(windTowerInfo.getInstallationTime() != null ? DateUtil.format(windTowerInfo.getInstallationTime(), "yyyy-MM-dd") : "");
+                equipment.setManufacturer(windTowerInfo.getManufacturer());
+                equipment.setModelNumber(windTowerInfo.getModelNumber());
+                equipment.setWdHeights(windTowerInfo.getWdHeights());
+                equipment.setType(windTowerInfo.getType());
+                equipment.setStatus(windTowerInfo.getStatus());
+                equipment.setPassword(windTowerInfo.getPassword());
+                equipment.setName(windTowerInfo.getName());
+                equipment.setRecorderNo(windTowerInfo.getRecorderNo());
+                equipment.setTerrainComplexity(windTowerInfo.getTerrainComplexity());
+                equipmentList.add(equipment);
+            }
+        }
+        return equipmentList;
+
+    }
 
 }

neim-ui/src/views/dataQuery/electrucStation/index.vue

@@ -17,26 +17,17 @@
       <el-table v-loading="loading" border
                 :data="tableAllData.slice((page.currentPage-1)*page.pageSize,page.currentPage*page.pageSize)">
         <el-table-column type="index" label="序号" width="55" align="center"/>
-<!--        <el-table-column label="场站编号" align="center" prop="stationCode"/>-->
-        <el-table-column label="电站名称" align="center" prop="name"/>
-<!--        <el-table-column label="场站标识" align="center" prop="sign"/>-->
-<!--        <el-table-column label="别名" align="center" prop="netSubstationName"/>-->
-        <el-table-column label="场站装机容量（MW）" align="center" prop="capacity"/>
-        <!--        <el-table-column label="并网设备数" align="center" prop="gridCE"/>-->
+        <el-table-column label="场站编号" align="center" prop="stationId"/>
+        <el-table-column label="场站名称" align="center" prop="stationName"/>
+        <el-table-column label="简称" align="center" prop="abbreviation"/>
         <el-table-column label="场站经度" align="center" prop="longitude"/>
         <el-table-column label="场站纬度" align="center" prop="latitude"/>
-        <el-table-column label="场站海拔" align="center" prop="altitude"/>
-        <el-table-column label="场站类型" align="center" prop="electricFieldType" :formatter="formatStatus" />
-<!--        <el-table-column label="场站状态" align="center" prop="stationStatus" :formatter="formatType" />-->
-        <!--        <el-table-column label="入库时间间隔(s)" align="center" prop="interval"/>-->
-        <el-table-column label="场站所属公司" align="center" prop="company"/>
-        <el-table-column label="场站位置" align="center" prop="location"/>
-        <el-table-column label="关联设备" align="center" prop="relationEquipment">
-          <template slot-scope="scope">
-            <span>{{ formatEquipment(scope.row.relationEquipment) }}</span>
-          </template>
+        <el-table-column label="场站类型" align="center" prop="stationType" :formatter="formatStatus" />
+        <el-table-column label="关联设备" align="center" prop="equipment">
+<!--          <template slot-scope="scope">-->
+<!--            <span>{{ formatEquipment(scope.row.equipment) }}</span>-->
+<!--          </template>-->
         </el-table-column>
-        <el-table-column label="场站面积" align="center" prop="area"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -68,48 +59,26 @@
         </el-pagination>
       </div>
 
-      <!--<pagination-->
-      <!--v-show="total>0"-->
-      <!--:total="total"-->
-      <!--:page.sync="queryParams.pageNum"-->
-      <!--:limit.sync="queryParams.pageSize"-->
-      <!--@pagination="getList"-->
-      <!--/>-->
     </el-card>
     <!-- 添加或修改测风塔信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20" class="mb8">
           <el-col :span="12">
-            <el-form-item label="场站名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入场站名称"/>
+            <el-form-item label="场站编号" prop="stationId">
+              <el-input v-model="form.stationId" placeholder="请输入场站编号"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="场站面积" prop="area">
-              <el-input v-model="form.area" placeholder="请输入场站面积"/>
+            <el-form-item label="场站名称" prop="stationName">
+              <el-input v-model="form.stationName" placeholder="请输入场站名称"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="电站名称" prop="name">-->
-        <!--              <el-input v-model="form.name" placeholder="请输入电站名称"/>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="场站标识" prop="sign">-->
-        <!--              <el-input v-model="form.sign" placeholder="请输入场站标识"/>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="别名" prop="netSubstationName">-->
-        <!--              <el-input v-model="form.netSubstationName" placeholder="请输入别名"/>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
         <el-row :gutter="20" class="mb8">
           <el-col :span="12">
-            <el-form-item label="场站装机容量（MW）" prop="capacity">
-              <el-input v-model="form.capacity" placeholder="请输入场站装机容量（MW）"/>
+            <el-form-item label="简称" prop="abbreviation">
+              <el-input v-model="form.abbreviation" placeholder="简称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -125,15 +94,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="海拔" prop="altitude">
-              <el-input v-model="form.altitude" placeholder="请输入海拔"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="场站类型" prop="electricFieldType">
-              <el-select v-model="form.electricFieldType" placeholder="请选择" style="width: 100%" clearable>
+            <el-form-item label="场站类型" prop="stationType">
+              <el-select v-model="form.stationType" placeholder="请选择" style="width: 100%" clearable>
                 <el-option
                   v-for="item in terrain"
                   :key="item.value"
@@ -143,37 +105,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="场站所属公司" prop="company">
-              <el-input v-model="form.company" placeholder="请输入场站所属公司"/>
-            </el-form-item>
-          </el-col>
         </el-row>
-        <el-row :gutter="20" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="场站位置" prop="location">
-              <el-input v-model="form.location" placeholder="请输入场站位置"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-<!--        <el-row :gutter="20" class="mb8">-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="场站状态" prop="stationStatus">-->
-<!--              <el-select v-model="form.stationStatus" placeholder="请选择" style="width: 100%" clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in status"-->
-<!--                  :key="item.value"-->
-<!--                  :label="item.label"-->
-<!--                  :value="item.value">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-        <el-form-item label="关联设备" prop="relationEquipment">
-          <el-select v-model="form.relationEquipment" placeholder="请选择" style="width: 100%" multiple clearable>
+
+        <el-form-item label="关联设备" prop="equipment">
+          <el-select v-model="form.equipment" placeholder="请选择" style="width: 100%" multiple clearable>
             <el-option
-              v-for="item in relationEquipmentData"
+              v-for="item in equipment"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -269,7 +206,7 @@ export default {
           {pattern: /^-?((0|[1-8]?[0-9]?)(([.][0-9]{1,10})?)|90(([.][0]{1,10})?))$/, message: '请输入正确的纬度'}
           // {message: '输入过长', max: 10}
         ],
-        electricFieldType: [
+        stationType: [
           {required: true, message: '请填写场站类型'}
         ],
         altitude: [
@@ -291,13 +228,13 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10 // 每页显示多少条
       },
-      terrain: [{label: "风力电站", value: "F1"},
-        {label: "光伏电站", value: "F2"}],
+      terrain: [{label: "风力电站", value: "风"},
+        {label: "光伏电站", value: "光"}],
       status: [
         {label: "运行中", value: "Y1"},
         {label: "未运行", value: "Y2"},
       ],
-      relationEquipmentData: [],
+      equipment: [],
       heightOption: []
     };
   },
@@ -311,30 +248,29 @@ export default {
     /*获取所有的测风塔*/
     getAllWindTowerInfo() {
       listAllDisabled().then(res => {
-        this.relationEquipmentData = res.data
+        this.equipment = res.data
       })
     },
-    formatEquipment(data) {
-      console.log(data)
-      if (data !== null) {
-        var a = data.split(",");
-        var b = "";
-        if (a.length !== 0) {
-          for (let i = 0; i < a.length; i++) {
-            for (let k = 0; k < this.relationEquipmentData.length; k++) {
-              if (this.relationEquipmentData[k].value === a[i]) {
-                b += this.relationEquipmentData[k].label
-                if (i !== a.length - 1) {
-                  b += ","
-                }
-              }
-            }
-          }
-          return b;
-        }
-      }
-
-    },
+    // formatEquipment(data) {
+    //   console.log(data)
+    //   if (data !== null) {
+    //     var a = data.split(",");
+    //     var b = "";
+    //     if (a.length !== 0) {
+    //       for (let i = 0; i < a.length; i++) {
+    //         for (let k = 0; k < this.equipment.length; k++) {
+    //           if (this.equipment[k].value === a[i]) {
+    //             b += this.equipment[k].label
+    //             if (i !== a.length - 1) {
+    //               b += ","
+    //             }
+    //           }
+    //         }
+    //       }
+    //       return b;
+    //     }
+    //   }
+    // },
     /** 查询测风塔信息列表 */
     getList() {
       // this.loading = true;
@@ -353,20 +289,13 @@ export default {
     reset() {
       this.form = {
         id: null,
-        stationCode: null,
-        stationStatus: null,
-        name: null,
-        sign: null,
-        netSubstationName: null,
-        capacity: null,
+        stationId: null,
+        stationName: null,
+        abbreviation: null,
         longitude: null,
         latitude: null,
-        altitude: null,
-        electricFieldType: null,
-        company: null,
-        location: null,
-        area: null,
-        relationEquipment: null
+        stationType: null,
+        equipment: null
       };
       this.resetForm("form");
     },
@@ -402,34 +331,27 @@ export default {
       var a = null
       const id = row.id || this.ids
       this.modId = id
-      if (row.relationEquipment !== null) {
-        a = row.relationEquipment.split(",")
-        a = a.length === 1 && a[0] === "" ? null : row.relationEquipment.split(",")
+      if (row. equipment!== null) {
+        a = row.equipment.split(",")
+        a = a.length === 1 && a[0] === "" ? null : row.equipment.split(",")
       }
       this.form = {
         id: row.id,
-        stationCode: row.stationCode,
-        stationStatus: row.stationStatus,
-        name: row.name,
-        sign: row.sign,
-        netSubstationName: row.netSubstationName,
-        capacity: row.capacity,
+        stationId: row.stationId,
+        stationName: row.stationName,
+        abbreviation: row.abbreviation,
         longitude: row.longitude,
         latitude: row.latitude,
-        electricFieldType: row.electricFieldType,
-        company: row.company,
-        altitude: row.altitude,
-        location: row.location,
-        relationEquipment: a,
-        area: row.area
+        stationType: row.stationType,
+        equipment: a
       };
     },
     /** 提交按钮 */
     submitForm() {
       // this.form.heights = this.form.heights.toString()
       this.$refs["form"].validate(valid => {
-        if (this.form.relationEquipment !== null) {
-          this.form.relationEquipment = this.form.relationEquipment.toString()
+        if (this.form.equipment !== null) {
+          this.form.equipment = this.form.equipment.toString()
         }
         if (valid) {
           if (this.form.id != null) {
@@ -450,7 +372,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认场站名称为"' + row.stationCode + '"信息及所有数据？').then(function () {
+      this.$modal.confirm('是否确认场站名称为"' + row.stationName + '"信息及所有数据？').then(function () {
         return delElectricStation(row);
       }).then(() => {
         this.getList();
@@ -468,13 +390,13 @@ export default {
       this.page.currentPage = val
     },
     formatStatus(row){
-      let option = this.terrain.find(w=>w.value === row.electricFieldType)
-      return option !==undefined?option.label:row.electricFieldType
-    },
-    formatType(row){
-      let option = this.status.find(w=>w.value === row.stationStatus)
-      return option !==undefined?option.label:row.stationStatus
+      let option = this.terrain.find(w=>w.value === row.stationType)
+      return option !==undefined?option.label:row.stationType
     },
+    // formatType(row){
+    //   let option = this.status.find(w=>w.value === row.stationStatus)
+    //   return option !==undefined?option.label:row.stationStatus
+    // },
   }
 };
 </script>