风机数据展示

ipp-ap/src/const/crud/windturbinestatusdata.js

@@ -26,7 +26,7 @@ export const tableOption = {
   },
     {
       "type": "input",
-      "label": "设备编号",
+      "label": "设备名称",
       "prop": "equipmentId"
     }
     , {
@@ -65,11 +65,11 @@ export const tableOption = {
       "label": "无功(KVar)",
       "prop": "reactivePower"
     }
-    , {
-      "type": "input",
-      "label": "功率因数",
-      "prop": "powerFactor"
-    }
+    // , {
+    //   "type": "input",
+    //   "label": "功率因数",
+    //   "prop": "powerFactor"
+    // }
     , {
       "type": "input",
       "label": "电压(V)",
@@ -80,16 +80,16 @@ export const tableOption = {
       "label": "电流(A)",
       "prop": "electricalCurrent"
     }
-    , {
-      "type": "input",
-      "label": "当日发电量(kW·h)",
-      "prop": "dayElectricQuantity"
-    }
-    , {
-      "type": "input",
-      "label": "当日并网小时",
-      "prop": "dayGridConnectedHours"
-    }
+    // , {
+    //   "type": "input",
+    //   "label": "当日发电量(kW·h)",
+    //   "prop": "dayElectricQuantity"
+    // }
+    // , {
+    //   "type": "input",
+    //   "label": "当日并网小时",
+    //   "prop": "dayGridConnectedHours"
+    // }
     , {
       "type": "input",
       "label": "转速(rpm)",
@@ -107,7 +107,7 @@ export const tableOption = {
     }
     , {
       "type": "input",
-      "label": "温度(℃)",
+      "label": "环境温度(℃)",
       "prop": "t"
     }
     , {
@@ -115,10 +115,10 @@ export const tableOption = {
       "label": "桨距角(°)",
       "prop": "pitchAngle"
     }
-    , {
-      "type": "input",
-      "label": "累积发电量(MW·h)",
-      "prop": "cumulativeGeneratedEnergy"
-    }
+    // , {
+    //   "type": "input",
+    //   "label": "累积发电量(MW·h)",
+    //   "prop": "cumulativeGeneratedEnergy"
+    // }
   ]
 }

ipp-ap/src/router/page/index.js

@@ -44,6 +44,16 @@ export default [
     }],
   },
   {
+    path: '/idp/data/windturbinestatusdata',
+    component: Layout,
+    children: [{
+      path: 'index',
+      name: '风机数据查询',
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/idp/data/windturbinestatusdata')
+    }],
+  },
+  {
     path: '/idp/data/weatherstationstatusdata',
     component: Layout,
     children: [{

ipp-ap/src/router/views/index.js

@@ -50,6 +50,21 @@ export default [
         icon: "",
         id: "4080",
         keepAlive: "0",
+        label: "风机数据查询",
+        menuType: "0",
+        name: "风机数据查询",
+        parentId: "4058",
+        path: "/idp/data/windturbinestatusdata/index",
+        permission: "",
+        sort: 1,
+        spread: false
+      },
+      {
+        children: [],
+        hasChildren: false,
+        icon: "",
+        id: "4080",
+        keepAlive: "0",
         label: "气象站数据查询",
         menuType: "0",
         name: "气象站数据查询",

ipp-ap/src/views/idp/data/windturbinestatusdata/index.vue

@@ -69,7 +69,6 @@
       <avue-crud ref="crud"
                  :page.sync="page"
                  :data="tableData"
-                 :permission="permissionList"
                  :table-loading="tableLoading"
                  :option="tableOption"
                  @search-change="searchChange"

ipp-idp/src/main/java/com/jiayue/ipp/idp/controller/WindTurbineStatusDataController.java

@@ -0,0 +1,58 @@
+package com.jiayue.ipp.idp.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jiayue.ipp.common.data.entity.WindTurbineStatusData;
+import com.jiayue.ipp.idp.service.WindTurbineStatusDataService;
+import com.jiayue.ipp.idp.util.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+
+/**
+ * idp_wind_turbine_status_data
+ *
+ * @author whc
+ * @date 2022-03-18 15:50:07
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/windturbinestatusdata")
+@Api(value = "windturbinestatusdata", tags = "idp_wind_turbine_status_data管理")
+public class WindTurbineStatusDataController {
+
+    private final WindTurbineStatusDataService windTurbineStatusDataService;
+
+    /**
+     * 分页查询
+     *
+     * @param page                  分页对象
+     * @param windTurbineStatusData idp_wind_turbine_status_data
+     * @return
+     */
+    @ApiOperation(value = "分页查询", notes = "分页查询")
+    @GetMapping("/page")
+    public R getWindTurbineStatusDataPage(Page page, WindTurbineStatusData windTurbineStatusData) {
+        return R.ok(windTurbineStatusDataService.page(page, Wrappers.query(windTurbineStatusData)));
+    }
+
+    /**
+     * 根据场站编号和设备ID分页查询
+     *
+     * @param page        分页
+     * @param stationCode 场站编号
+     * @return
+     */
+    @ApiOperation(value = "根据场站编号和设备ID和时间范围分页查询", notes = "分页查询")
+    @PostMapping("/getByStationCodeAndEquipmentIdAndTimeBetween")
+    public R getByStationCodeAndEquipmentIdAndTimeBetween(Page page, String stationCode, String equipmentId, Long startTime, Long endTime) {
+        return R.ok(windTurbineStatusDataService.page(page, windTurbineStatusDataService.getByStationCodeAndEquipmentIdAndTimeBetween(stationCode, equipmentId, new Date(startTime), new Date(endTime))));
+    }
+}