页面

wps-biz/src/main/java/com/jiayue/biz/controller/EnvironmentalDataController.java

@@ -0,0 +1,29 @@
+package com.jiayue.biz.controller;
+
+import com.jiayue.biz.domain.EnvironmentalData;
+import com.jiayue.biz.service.EnvironmentalDataService;
+import com.jiayue.biz.service.WeatherLookService;
+import com.jiayue.common.annotation.Log;
+import com.jiayue.common.core.controller.BaseController;
+import com.jiayue.common.core.domain.AjaxResult;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/environmentalData")
+public class EnvironmentalDataController extends BaseController {
+    private final EnvironmentalDataService environmentalDataService;
+    @GetMapping
+    public AjaxResult infoList(String weatherLookNo, long startTime, long endTime) {
+        List<EnvironmentalData> environmentalData = environmentalDataService.selectData(weatherLookNo, new Timestamp(startTime), new Timestamp(endTime));
+        return AjaxResult.success(environmentalData);
+    }
+}

wps-biz/src/main/java/com/jiayue/biz/controller/WeatherLookController.java

@@ -1,15 +1,71 @@
 package com.jiayue.biz.controller;
 
+import com.jiayue.biz.domain.WeatherLook;
+import com.jiayue.biz.service.WeatherLookService;
+import com.jiayue.common.annotation.Log;
 import com.jiayue.common.core.controller.BaseController;
+import com.jiayue.common.core.domain.AjaxResult;
+import com.jiayue.common.core.page.TableDataInfo;
+import com.jiayue.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/weatherLook")
 public class WeatherLookController extends BaseController {
+    private final WeatherLookService weatherLookService;
+    /**
+     * 查询环境监测仪信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list() {
+        List<WeatherLook> weatherLooks = weatherLookService.list();
+        return getDataTable(weatherLooks);
+    }
+
+
+    /**
+     * 新增环境监测仪信息
+     */
+    @Log(title = "环境监测仪信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WeatherLook weatherLook) {
+        return toAjax(weatherLookService.save(weatherLook) ? 1 : 0);
+    }
 
+    /**
+     * 修改环境监测仪信息
+     */
+    @Log(title = "环境监测仪信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WeatherLook weatherLook) {
+        return toAjax(weatherLookService.updateById(weatherLook) ? 1 : 0);
+    }
 
+    /**
+     * 删除环境监测仪信息
+     */
+    @Log(title = "环境监测仪信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String ids) {
+        return toAjax(weatherLookService.removeById(ids) ? 1 : 0);
+    }
+    @GetMapping("/infoList")
+    public AjaxResult infoList() {
+        List<WeatherLook> weatherLookList = weatherLookService.list();
+        List list = new ArrayList();
+        for(WeatherLook weatherLook : weatherLookList){
+            HashMap map = new HashMap();
+            map.put("no",weatherLook.getWeatherLookNo());
+            map.put("name",weatherLook.getWeatherLookName());
+            list.add(map);
+        }
+        return AjaxResult.success(list);
+    }
 }

wps-biz/src/main/java/com/jiayue/biz/domain/WeatherLook.java

@@ -1,5 +1,7 @@
 package com.jiayue.biz.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -12,6 +14,7 @@ public class WeatherLook {
     /**
      * id
      */
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
     /**
      * 环境监测仪名称

wps-biz/src/main/java/com/jiayue/biz/mapper/EnvironmentalDataMapper.java

@@ -3,12 +3,18 @@ package com.jiayue.biz.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.biz.domain.EnvironmentalData;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.sql.Timestamp;
+import java.util.List;
+
 @DS("tdengine")
 public interface EnvironmentalDataMapper extends BaseMapper<EnvironmentalData> {
 
     @Select("insert into environmental_${weatherLookNo} USING environmental_data TAGS(#{weatherLookNo}) values(#{ts},#{ws},#{wd},#{t},#{rh},#{pa})")
     public void insertOne(EnvironmentalData environmentalData);
 
+    @Select("select * from environmental_${weatherLookNo} where weatherLook_no = #{weatherLookNo} and ts >= #{startTime} and ts <= #{endTime}")
+    List<EnvironmentalData> selectEnvironmentalData(@Param("weatherLookNo") String weatherLookNo, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime);
 }

wps-biz/src/main/java/com/jiayue/biz/service/EnvironmentalDataService.java

@@ -3,6 +3,11 @@ package com.jiayue.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jiayue.biz.domain.EnvironmentalData;
 
+import java.sql.Timestamp;
+import java.util.List;
+
 public interface EnvironmentalDataService extends IService<EnvironmentalData> {
     void insertOne(EnvironmentalData environmentalData);
+    //查询所有数据
+    List<EnvironmentalData> selectData(String weatherLookNo, Timestamp startTime, Timestamp endTime);
 }

wps-biz/src/main/java/com/jiayue/biz/service/impl/EnvironmentalDataServiceImpl.java

@@ -6,11 +6,20 @@ import com.jiayue.biz.mapper.EnvironmentalDataMapper;
 import com.jiayue.biz.service.EnvironmentalDataService;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
+import java.util.List;
+
 @Service
-public class EnvironmentalDataServiceImpl extends ServiceImpl<EnvironmentalDataMapper,EnvironmentalData> implements EnvironmentalDataService {
+public class EnvironmentalDataServiceImpl extends ServiceImpl<EnvironmentalDataMapper, EnvironmentalData> implements EnvironmentalDataService {
 
-    public void insertOne(EnvironmentalData environmentalData){
+    public void insertOne(EnvironmentalData environmentalData) {
         baseMapper.insertOne(environmentalData);
     }
 
+    @Override
+    public List<EnvironmentalData> selectData(String weatherLookNo, Timestamp startTime, Timestamp endTime) {
+        return baseMapper.selectEnvironmentalData(weatherLookNo, startTime, endTime);
+    }
+
+
 }

wps-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 新能源风光资源监测平台
+VUE_APP_TITLE = 风压管理平台
 
 # 开发环境配置
 ENV = 'development'

wps-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 新能源风光资源监测平台
+VUE_APP_TITLE = 风压管理平台
 
 # 生产环境配置
 ENV = 'production'

wps-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 新能源风光资源监测平台
+VUE_APP_TITLE = 风压管理平台
 
 NODE_ENV = production
 

wps-ui/src/api/biz/dataQuery/environmentalData.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+// 查询所有环境监测仪信息
+export function list(query) {
+  return request({
+    url: '/environmentalData',
+    method: 'get',
+    params: query
+  })
+}

wps-ui/src/api/biz/dataQuery/weatherLook.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+
+// 查询所有环境监测仪信息
+export function list() {
+  return request({
+    url: '/weatherLook/list',
+    method: 'get'
+  })
+}
+
+
+// 新增环境监测仪信息
+export function addWeatherLook(data) {
+  return request({
+    url: '/weatherLook',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改环境监测仪信息
+export function updateWeatherLook(data) {
+  return request({
+    url: '/weatherLook',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除环境监测仪信息
+export function delWeatherLook(id) {
+  return request({
+    url: '/weatherLook/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询环境监测仪信息下拉框
+export function infoList() {
+  return request({
+    url: '/weatherLook/infoList',
+    method: 'get'
+  })
+}

wps-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '风资源管理平台',
+      title: '风压管理平台',
       logo: logoImg
     }
   }

wps-ui/src/views/dataQuery/WeatherStationStatusData/index.vue

@@ -15,35 +15,28 @@
         </div>
         <div class="conOne">
           <span>设备：</span>
-          <el-select v-model="eqId" placeholder="请选择" @change="changeEquipment">
+          <el-select v-model="eqNo" placeholder="请选择">
             <el-option
               v-for="item in equipmentAllInfo"
-              :key="item.equipmentNo"
+              :key="item.no"
               :label="item.name"
-              :value="item.equipmentNo">
+              :value="item.no">
             </el-option>
           </el-select>
         </div>
-        <el-button class="myButton" type="primary" icon="el-icon-search">搜索</el-button>
+        <el-button :loading="btuLoading" class="myButton" type="primary" icon="el-icon-search" @change="getData">搜索</el-button>
       </div>
       <div class="tableBox">
         <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="time"/>
-          <el-table-column label="总辐射" align="center" prop="globalR"/>
-          <el-table-column label="直接辐射" align="center" prop="directR"/>
-          <el-table-column label="散射辐射" align="center" prop="diffuseR"/>
-          <el-table-column label="斜面辐射" align="center" prop="obliqueR"/>
-          <el-table-column label="环境温度" align="center" prop="airT"/>
+          <el-table-column label="时间" align="center" prop="ts"/>
+          <el-table-column label="风速" align="center" prop="ws"/>
+          <el-table-column label="风向" align="center" prop="wd"/>
+          <el-table-column label="温度" align="center" prop="t"/>
           <el-table-column label="气压" align="center" prop="p"/>
           <el-table-column label="湿度" align="center" prop="rh"/>
-          <el-table-column label="光伏电池板温度" align="center" prop="cellT"/>
-          <el-table-column label="日照小时数" align="center" prop="hourDA"/>
-          <el-table-column label="总辐射日累计" align="center" prop="globalRDA"/>
-          <el-table-column label="直接辐射日累计" align="center" prop="directRDA"/>
-          <el-table-column label="散射辐射日累计" align="center" prop="diffuseRDA"/>
-          <el-table-column label="斜面辐射日累计" align="center" prop="obliqueRDA"/>
+
         </el-table>
       </div>
       <div class="block" style="float: right">
@@ -62,11 +55,15 @@
 </template>
 
 <script>
+import {infoList} from "@/api/biz/dataQuery/weatherLook";
+import {list} from "@/api/biz/dataQuery/environmentalData";
+
 export default {
   name: "index",
-  data(){
-    return{
-      loading:false,
+  data() {
+    return {
+      loading: false,
+      btuLoading: true,
       tableAllData: [],
       //时间控件
       dataTime: [new Date(new Date().toLocaleDateString()).getTime() - 24 * 60 * 60 * 1000, new Date(new Date().toLocaleDateString()).getTime()],
@@ -75,19 +72,40 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10 // 每页显示多少条
       },
-      eqId:'',
+      eqNo: '',
       equipmentAllInfo: []
     }
   },
-  methods:{
-    changeEquipment(){
-
-    },
-    handleUpdate(row){
-
+  mounted() {
+    this.getWeatherLook()
+  },
+  methods: {
+    getWeatherLook() {
+      infoList().then(res => {
+        this.equipmentAllInfo = res.data
+        this.eqNo = this.equipmentAllInfo[0].weatherLookNo
+        this.getData()
+      }).catch(err => {
+        console.log('获取环境检测仪异常' + err)
+      })
     },
-    handleDelete(row){
-
+    getData(){
+      this.btuLoading = true
+      this.loading = true
+      let param = {
+        startTime: new Date(this.dataTime[0]).getTime(),
+        endTime: new Date(this.dataTime[1]).getTime(),
+        weatherLookNo: this.eqNo,
+      }
+      list(param).then(res=>{
+        this.tableAllData = res.data
+        this.btuLoading = false
+        this.loading = false
+      }).catch(err=>{
+        this.btuLoading = false
+        this.loading = false
+        console.log('获取环境监测仪数据异常：'+err)
+      })
     },
     /*pageSize改变*/
     handleSizeChange(val) {
@@ -110,7 +128,8 @@ export default {
 .conOne, .myButton {
   margin-left: .5%;
 }
-.tableBox{
+
+.tableBox {
   margin-top: 1%;
 }
 

wps-ui/src/views/dataQuery/weatherStationInfo/index.vue

@@ -12,11 +12,13 @@
       <div style="margin-top: 1%">
         <el-table v-loading="loading" border
                   :data="tableData.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="name"/>
+          <!--          <el-table-column type="index" label="序号" width="55" align="center"/>-->
+          <el-table-column label="编号" align="center" prop="weatherLookNo"/>
+          <el-table-column label="名称" align="center" prop="weatherLookName"/>
           <el-table-column label="型号" align="center" prop="modelNumber"/>
           <el-table-column label="经度" align="center" prop="longitude"/>
           <el-table-column label="纬度" align="center" prop="latitude"/>
+          <el-table-column label="厂家" align="center" prop="factory"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -55,13 +57,13 @@
         <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="weatherLookName">
+                <el-input v-model="form.weatherLookName" placeholder="请输入名称"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="型号" prop="modelNumber">
-                <el-input v-model="form.modelNumber" placeholder="请输入型号"/>
+              <el-form-item label="编号" prop="weatherLookNo">
+                <el-input v-model="form.weatherLookNo" placeholder="请输入环境监测仪编号"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -77,6 +79,18 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="12">
+              <el-form-item label="型号" prop="modelNumber">
+                <el-input v-model="form.modelNumber" placeholder="请输入型号"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="厂家" prop="factory">
+                <el-input v-model="form.factory" placeholder="请输入厂家"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -88,7 +102,8 @@
 </template>
 
 <script>
-// import {list,addWeatherStationInfo,updateWeatherStationInfo,delWeatherStationInfo} from "@/api/biz/dataQuery/weatherStationInfo";
+import {list, addWeatherLook, updateWeatherLook, delWeatherLook} from "@/api/biz/dataQuery/weatherLook";
+
 export default {
   name: "index",
   data() {
@@ -100,13 +115,13 @@ export default {
       for (let i = 0; i < s6.length; i++) {
         if (this.modId == '') {
           // 新增
-          if ((value == s6[i].name)) {
+          if ((value == s6[i].weatherLookName)) {
             callback(new Error('名称不能重复'))
           }
         } else {
           // 修改
           if (this.modId != s6[i].id) {
-            if ((value == s6[i].name)) {
+            if ((value == s6[i].weatherLookName)) {
               callback(new Error('名称不能重复'))
             }
           }
@@ -114,6 +129,28 @@ export default {
       }
       callback()
     }
+    const checkNo = (rule, value, callback) => {
+      var s6 = this.tableData
+      if (value == null || value === '') {
+        callback(new Error('请填写环境监测仪编号'))
+      }
+      for (let i = 0; i < s6.length; i++) {
+        if (this.modId == '') {
+          // 新增
+          if ((value == s6[i].weatherLookNo)) {
+            callback(new Error('编号不能重复'))
+          }
+        } else {
+          // 修改
+          if (this.modId != s6[i].id) {
+            if ((value == s6[i].weatherLookNo)) {
+              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 checkLongitude = (rule, value, callback) => {
@@ -139,13 +176,14 @@ export default {
     return {
       tableData: [],
       loading: false,
-      open:false,
-      title:'新增&保存',
-      modId:'',
+      open: false,
+      title: '新增&保存',
+      modId: '',
       form: {},
       // 表单校验
       rules: {
-        name: [{required: true, validator: checkName, trigger: 'blur'}],
+        weatherLookName: [{required: true, validator: checkName, trigger: 'blur'}],
+        weatherLookNo: [{required: true, validator: checkNo, trigger: 'blur'}],
         // modelNumber: [{required: true,  message:'请输入型号', trigger: 'blur'}],
         longitude: [{required: true, validator: checkLongitude, trigger: 'blur'}],
         latitude: [{required: true, validator: checkLatitude, trigger: 'blur'}],
@@ -158,18 +196,18 @@ export default {
     }
   },
   mounted() {
-    // this.getList()
+    this.getList()
   },
   methods: {
-    getList(){
+    getList() {
       this.loading = true
-      list().then(res=>{
+      list().then(res => {
         this.tableData = res.rows
         this.page.total = res.total
         this.loading = false
-      }).catch(err=>{
+      }).catch(err => {
         this.loading = false
-        console.log('获取环境监测仪异常：'+err)
+        console.log('获取环境监测仪异常：' + err)
       })
     },
     /*新增按钮*/
@@ -184,7 +222,9 @@ export default {
       this.modId = row.id
       this.form = {
         id: row.id,
-        name: row.name,
+        weatherLookName: row.weatherLookName,
+        weatherLookNo: row.weatherLookNo,
+        factory: row.factory,
         modelNumber: row.modelNumber,
         longitude: row.longitude,
         latitude: row.latitude
@@ -196,7 +236,7 @@ export default {
     handleDelete(row) {
       const ids = row.id;
       this.$modal.confirm('是否确认删除环境监测仪信息名称为"' + row.name + '"信息及所有数据？').then(function () {
-        return delWeatherStationInfo(ids);
+        return delWeatherLook(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -209,13 +249,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateWeatherStationInfo(this.form).then(response => {
+            updateWeatherLook(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addWeatherStationInfo(this.form).then(response => {
+            addWeatherLook(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -229,10 +269,12 @@ export default {
       this.open = false;
       this.reset();
     },
-    reset(){
+    reset() {
       this.form = {
-        id:null,
-        name:null,
+        id: null,
+        weatherLookName: null,
+        weatherLookNo: null,
+        factory: null,
         modelNumber: null,
         longitude: null,
         latitude: null

wps-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">风压系统</h3>
+      <h3 class="title">风压管理平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

wps-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '新能源风光资源监测平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '风压管理平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 83 // 端口