逆变器

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

@@ -67,8 +67,8 @@ public class InverterInfoController extends BaseController {
     }
     //查询逆变器
     @GetMapping("/getInverterInfo")
-    public AjaxResult selectInverterInfo(){
-        return AjaxResult.success(inverterInfoService.selectInverterInfo());
+    public AjaxResult selectInverterInfo(String id){
+        return AjaxResult.success(inverterInfoService.selectInverterInfo(id));
     }
 
 

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

@@ -42,18 +42,18 @@ public class InverterInfo {
      * 经度
      */
     @Excel(name = "经度")
-    private BigDecimal longitude;
+    private String longitude;
 
     /**
      * 纬度
      */
     @Excel(name = "纬度")
-    private BigDecimal latitude;
+    private String latitude;
     /**
      * 额定功率（KW）
      */
     @Excel(name = "额定功率")
-    private BigDecimal capacity;
+    private String capacity;
     /**
      * 光伏组件型号
      */
@@ -64,5 +64,5 @@ public class InverterInfo {
      * 光伏组件数量（个）
      */
     @Excel(name = "光伏组件数量")
-    private Integer batteryNumber;
+    private String batteryNumber;
 }

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

@@ -37,16 +37,16 @@ public class InverterInfoDto {
     /**
      * 经度
      */
-    private BigDecimal longitude;
+    private String longitude;
 
     /**
      * 纬度
      */
-    private BigDecimal latitude;
+    private String latitude;
     /**
      * 额定功率（KW）
      */
-    private BigDecimal capacity;
+    private String capacity;
     /**
      * 光伏组件型号
      */
@@ -55,7 +55,7 @@ public class InverterInfoDto {
     /**
      * 光伏组件数量（个）
      */
-    private Integer batteryNumber;
+    private String batteryNumber;
 
 
 

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

@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 public interface InverterInfoService {
 
     //查询逆变器
-    List<InverterInfoDto> selectInverterInfo();
+    List<InverterInfoDto> selectInverterInfo(String id);
 
     //新增逆变器
     void addInverterInfo(InverterInfoDto inverterInfoDto);

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

@@ -23,8 +23,15 @@ public class InverterInfoServiceImpl implements InverterInfoService {
 
 
     //查询逆变器
-    public List<InverterInfoDto> selectInverterInfo() {
-        List<StationInfo> stationInfos = stationInfoService.selectStationInfo();
+    public List<InverterInfoDto> selectInverterInfo(String id) {
+        List<StationInfo> stationInfos = new ArrayList<>();
+        if (id.equals("")) {
+            stationInfos = stationInfoService.selectStationInfo();
+        } else {
+            stationInfos.add(stationInfoService.getOneStationInfo(id));
+        }
+
+
         ArrayList<InverterInfoDto> list = new ArrayList<>();
         for (StationInfo stationInfo : stationInfos) {
             if (stationInfo.getStationBasicInfo().getStationType().equals("光") && stationInfo.getInverterInfos() != null) {
@@ -46,10 +53,13 @@ public class InverterInfoServiceImpl implements InverterInfoService {
 
     //新增逆变器
     public void addInverterInfo(InverterInfoDto inverterInfoDto) {
-        inverterInfoDto.setId(UUID.randomUUID().toString());
+        inverterInfoDto.setInverterInfoId(UUID.randomUUID().toString());
         StationInfo oneStationInfo = stationInfoService.getOneStationInfo(inverterInfoDto.getId());
         InverterInfo inverterInfo = new InverterInfo();
         this.getInverterInfo(inverterInfo, inverterInfoDto);
+        if (oneStationInfo.getInverterInfos() == null) {
+            oneStationInfo.setInverterInfos(new ArrayList<>());
+        }
         oneStationInfo.getInverterInfos().add(inverterInfo);
         stationInfoService.saveStation(oneStationInfo);
 
@@ -60,7 +70,7 @@ public class InverterInfoServiceImpl implements InverterInfoService {
         StationInfo oneStationInfo = stationInfoService.getOneStationInfo(inverterInfoDto.getId());
         List<InverterInfo> inverterInfos = oneStationInfo.getInverterInfos().stream().map(s -> {
             if (s.getId().equals(inverterInfoDto.getInverterInfoId())) {
-                this.getInverterInfo(s,inverterInfoDto);
+                this.getInverterInfo(s, inverterInfoDto);
             }
             return s;
         }).collect(Collectors.toList());

neim-ui/src/api/biz/dataQuery/inverterInfo.js

@@ -15,6 +15,38 @@ export function getStationInfo() {
     method: 'get'
   })
 }
+// 查询逆变器信息
+export function getInverterInfo(query) {
+  return request({
+    url: '/dataQuery/inverterInfo/getInverterInfo',
+    method: 'get',
+    params: query
+  })
+}
+// 新增逆变器信息
+export function addInverterInfo(data) {
+  return request({
+    url: '/dataQuery/inverterInfo/addInverterInfo',
+    method: 'post',
+    data: data
+  })
+}
+// 新增逆变器信息
+export function updateInverterInfo(data) {
+  return request({
+    url: '/dataQuery/inverterInfo/updateInverterInfo',
+    method: 'put',
+    data: data
+  })
+}
+// 新增逆变器信息
+export function deleteInverterInfo(data) {
+  return request({
+    url: '/dataQuery/inverterInfo/deleteInverterInfo',
+    method: 'delete',
+    data: data
+  })
+}
 
 
 

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

@@ -16,6 +16,14 @@
         <el-button
           type="primary"
           plain
+          icon="el-icon-search"
+          size="mini"
+          @click="getInverterInfo"
+        >查询
+        </el-button>
+        <el-button
+          type="primary"
+          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -79,7 +87,7 @@
                     v-for="item in stationOption"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.id">
+                    :value="item.name">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -146,34 +154,37 @@
 </template>
 
 <script>
-import {getPvModuleModel,getStationInfo} from "@/api/biz/dataQuery/inverterInfo";
+import {getPvModuleModel,getStationInfo,getInverterInfo,addInverterInfo,updateInverterInfo,deleteInverterInfo} from "@/api/biz/dataQuery/inverterInfo";
 export default {
   name: "index",
   data() {
     const checkName = (rule, value, callback) => {
-      var s6 = this.tableData
+      var s6 = this.tableData.filter(w=>w.id === this.form.id)
       if (value == null || value === '') {
         callback(new Error('请填写逆变器名称'))
       }
-      for (let i = 0; i < s6.length; i++) {
-        if (this.modId == '') {
-          // 新增
-          if ((value == s6[i].name)) {
-            callback(new Error('名称不能重复'))
-          }
-        } else {
-          // 修改
-          if (this.modId != s6[i].id) {
+      if(s6.length>0){
+        for (let i = 0; i < s6.length; i++) {
+          if (this.modId == '') {
+            // 新增
             if ((value == s6[i].name)) {
               callback(new Error('名称不能重复'))
             }
+          } else {
+            // 修改
+            if (this.modId != s6[i].id) {
+              if ((value == s6[i].name)) {
+                callback(new Error('名称不能重复'))
+              }
+            }
           }
         }
       }
+
       callback()
     }
-    const reg = /^[\-\+]?(0?\d{1,2}(\.\d{1,5})*|1[0-7]?\d{1}(\.\d{1,5})*|180(\.0{1,5})*)$/
-    const reg1 = /^[\-\+]?([0-8]?\d{1}(\.\d{1,5})*|90(\.0{1,5})*)$/
+    const reg = /^[\-\+]?(0?\d{1,2}(\.\d{1,9})*|1[0-7]?\d{1}(\.\d{1,9})*|180(\.0{1,9})*)$/
+    const reg1 = /^[\-\+]?([0-8]?\d{1}(\.\d{1,9})*|90(\.0{1,9})*)$/
     const checkLongitude = (rule, value, callback) => {
       if (!value) {
         callback(new Error('不许为空'))
@@ -202,6 +213,7 @@ export default {
       loading: false,
       open:false,
       title:'新增&保存',
+      saveFlag:'add',
       modId:'',
       form: {},
       // 表单校验
@@ -222,8 +234,22 @@ export default {
   mounted() {
     this.getStationInfo()
     this.getPvModuleModel()
+    this.getInverterInfo()
   },
   methods: {
+    /*获取逆变器信息*/
+    getInverterInfo(){
+      this.loading = true
+      let id = this.stationId
+      getInverterInfo({id:id}).then(res=>{
+        this.tableData = res.data
+        this.page.total = this.tableData.length
+        this.loading = false
+      }).catch(err=>{
+        this.loading = false
+        console.log('获取逆变器信息异常：'+err)
+      })
+    },
     /*获取场站信息*/
     getStationInfo(){
       getStationInfo().then(res=>{
@@ -240,30 +266,22 @@ export default {
         console.log('获取光伏组件的信息异常：'+err)
       })
     },
-    getList(){
-      this.loading = true
-      list().then(res=>{
-        this.tableData = res.rows
-        this.page.total = res.total
-        this.loading = false
-      }).catch(err=>{
-        this.loading = false
-        console.log('获取环境监测仪异常：'+err)
-      })
-    },
     /*新增按钮*/
     handleAdd() {
       this.reset()
       this.title = "新增&保存";
+      this.saveFlag = 'add'
       this.open = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       this.modId = row.id
+      this.saveFlag = 'edit'
       this.form = {
         stationName:row.stationName,
         id: row.id,
+        inverterInfoId:row.inverterInfoId,
         name: row.name,
         modelNumber: row.modelNumber,
         longitude: row.longitude,
@@ -277,11 +295,10 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id;
-      this.$modal.confirm('是否确认删除环境监测仪信息名称为"' + row.name + '"信息及所有数据？').then(function () {
-        // return delWeatherStationInfo(ids);
+      this.$modal.confirm('是否确认删除逆变器信息名称为"' + row.name + '"信息及所有数据？').then(function () {
+        return deleteInverterInfo(row);
       }).then(() => {
-        this.getList();
+        this.getInverterInfo();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
@@ -292,19 +309,20 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           console.log(this.form)
-          // if (this.form.id != null) {
-          //   updateWeatherStationInfo(this.form).then(response => {
-          //     this.$modal.msgSuccess("修改成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // } else {
-          //   addWeatherStationInfo(this.form).then(response => {
-          //     this.$modal.msgSuccess("新增成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // }
+          if (this.saveFlag !== 'add') {
+            updateInverterInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getInverterInfo();
+            });
+          } else {
+            this.form.id = this.stationOption.find(w=>w.name === this.form.stationName).id
+            addInverterInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getInverterInfo();
+            });
+          }
         }
       });
     },
@@ -317,6 +335,7 @@ export default {
       this.form = {
         stationName:null,
         id:null,
+        inverterInfoId:null,
         name:null,
         modelNumber: null,
         longitude: null,