更新

whycrzg

2021-05-14 54a8c95a36db1de702c0bbbf0f1a967a1cb1ea17

更新

 src/main/java/com/whyc/controller/EnvMonitoringController.java

@@ -1,15 +1,17 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.pojo.AFEInverterControl;
import com.whyc.pojo.InsulationMonitoring;
import com.whyc.pojo.LeakageMonitoring;
import com.whyc.pojo.WaterQualityMonitoring;
import com.whyc.service.*;
import com.whyc.service.InsulationMonitoringService;
import com.whyc.service.LeakageMonitoringService;
import com.whyc.service.WaterQualityMonitoringService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
@@ -38,24 +40,24 @@

    @GetMapping("stateWaterQuality")
    @ApiOperation(value = "水质监测")
    public Response<Object> getWaterQuality() {
    public Response<List<WaterQualityMonitoring>> getWaterQuality() {

        return waterQualityMonitoringService.getWaterQuality();
        return waterQualityMonitoringService.getAllWaterQuality();
    }

    @GetMapping("stateLeakageMonitoring")
    @ApiOperation(value = "漏水监测")
    public Response<Object> getLeakageMonitoring() {
    public Response<List<LeakageMonitoring>> getLeakageMonitoring() {

        return leakageMonitoringService.getLeakageMonitoring();
        return leakageMonitoringService.getAllLeakageMonitoring();
    }


    @GetMapping("stateInsulationMonitoring")
    @ApiOperation(value = "绝缘监测")
    public Response<Object> getInsulationMonitoring() {
    public Response<List<InsulationMonitoring>> getInsulationMonitoring() {

        return insulationMonitoringService.getInsulationMonitoring();
        return insulationMonitoringService.getAllInsulationMonitoring();
    }



 src/main/java/com/whyc/pojo/InsulationMonitoring.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;

import java.io.Serializable;
@@ -16,7 +17,17 @@
public class InsulationMonitoring implements Serializable {
    private Long num;

    private Double param1;
    /**
     * 绝缘监测设备ID
     */
    @ApiModelProperty("绝缘监测设备ID")
    private Integer insulationDevId;

    /**
     * 0绝缘；1不绝缘
     */
    @ApiModelProperty("0绝缘；1不绝缘")
    private Integer insulation;

    private Double param2;

@@ -48,12 +59,20 @@
        this.num = num;
    }

    public Double getParam1() {
        return param1;
    public Integer getInsulationDevId() {
        return insulationDevId;
    }

    public void setParam1(Double param1) {
        this.param1 = param1;
    public void setInsulationDevId(Integer insulationDevId) {
        this.insulationDevId = insulationDevId;
    }

    public Integer getInsulation() {
        return insulation;
    }

    public void setInsulation(Integer insulation) {
        this.insulation = insulation;
    }

    public Double getParam2() {

 src/main/java/com/whyc/pojo/LeakageMonitoring.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;

import java.io.Serializable;
@@ -16,7 +17,17 @@
public class LeakageMonitoring implements Serializable {
    private Long num;

    private Double param1;
    /**
     * 漏水监测设备ID
     */
    @ApiModelProperty(value ="漏水监测设备ID")
    private Integer leakageDevId;
    /**
     * 0无漏水：1漏水
     */
    @ApiModelProperty(value ="0无漏水：1漏水")
    private Integer leakage;


    private Double param2;

@@ -48,12 +59,20 @@
        this.num = num;
    }

    public Double getParam1() {
        return param1;
    public Integer getLeakageDevId() {
        return leakageDevId;
    }

    public void setParam1(Double param1) {
        this.param1 = param1;
    public void setLeakageDevId(Integer leakageDevId) {
        this.leakageDevId = leakageDevId;
    }

    public Integer getLeakage() {
        return leakage;
    }

    public void setLeakage(Integer leakage) {
        this.leakage = leakage;
    }

    public Double getParam2() {

 src/main/java/com/whyc/pojo/WaterQualityMonitoring.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.type.Alias;

import java.io.Serializable;
@@ -16,15 +17,41 @@
public class WaterQualityMonitoring implements Serializable {
    private Long num;

    private Double param1;
    /**
     * 水质监测设备ID
     */
    @ApiModelProperty("水质监测设备ID")
    private Integer waterDevId;

    private Double param2;
    /**
     * 水质类别
     */
    @ApiModelProperty("水质类别")
    private Double waterQualityCategory;

    private Double param3;
    /**
     * pH值
     */
    @ApiModelProperty("pH值")
    private Double ph;

    private Double param4;
    /**
     * 溶解氧
     */
    @ApiModelProperty("溶解氧")
    private Double dissolvedOxygen;

    private Double param5;
    /**
     * 导电率
     */
    @ApiModelProperty("导电率")
    private Double conductivity;

    /**
     * 浊度
     */
    @ApiModelProperty("浊度")
    private Double turbidity;

    private Double param6;

@@ -48,44 +75,52 @@
        this.num = num;
    }

    public Double getParam1() {
        return param1;
    public Integer getWaterDevId() {
        return waterDevId;
    }

    public void setParam1(Double param1) {
        this.param1 = param1;
    public void setWaterDevId(Integer waterDevId) {
        this.waterDevId = waterDevId;
    }

    public Double getParam2() {
        return param2;
    public Double getWaterQualityCategory() {
        return waterQualityCategory;
    }

    public void setParam2(Double param2) {
        this.param2 = param2;
    public void setWaterQualityCategory(Double waterQualityCategory) {
        this.waterQualityCategory = waterQualityCategory;
    }

    public Double getParam3() {
        return param3;
    public Double getPh() {
        return ph;
    }

    public void setParam3(Double param3) {
        this.param3 = param3;
    public void setPh(Double ph) {
        this.ph = ph;
    }

    public Double getParam4() {
        return param4;
    public Double getDissolvedOxygen() {
        return dissolvedOxygen;
    }

    public void setParam4(Double param4) {
        this.param4 = param4;
    public void setDissolvedOxygen(Double dissolvedOxygen) {
        this.dissolvedOxygen = dissolvedOxygen;
    }

    public Double getParam5() {
        return param5;
    public Double getConductivity() {
        return conductivity;
    }

    public void setParam5(Double param5) {
        this.param5 = param5;
    public void setConductivity(Double conductivity) {
        this.conductivity = conductivity;
    }

    public Double getTurbidity() {
        return turbidity;
    }

    public void setTurbidity(Double turbidity) {
        this.turbidity = turbidity;
    }

    public Double getParam6() {

 src/main/java/com/whyc/service/InsulationMonitoringService.java

@@ -15,9 +15,11 @@
    private InsulationMonitoringMapper mapper;


    public List<InsulationMonitoring> getAll() {
    public Response<List<InsulationMonitoring>> getAllInsulationMonitoring() {

        return mapper.selectList(null);
        Response<List<InsulationMonitoring>> response = new Response<>();
        List<InsulationMonitoring> insulationMonitorings = mapper.selectList(null);
        return response.set(1,insulationMonitorings);
    }

    public Response<Object> getInsulationMonitoring() {

 src/main/java/com/whyc/service/LeakageMonitoringService.java

@@ -16,9 +16,11 @@
    private LeakageMonitoringMapper mapper;


    public List<LeakageMonitoring> getAll() {
    public Response<List<LeakageMonitoring>> getAllLeakageMonitoring() {

        return mapper.selectList(null);
        Response<List<LeakageMonitoring>> response = new Response<>();
        List<LeakageMonitoring> leakageMonitorings = mapper.selectList(null);
        return response.set(1,leakageMonitorings);
    }

    public Response<Object> getLeakageMonitoring() {

 src/main/java/com/whyc/service/WaterQualityMonitoringService.java

@@ -16,10 +16,14 @@
    private WaterQualityMonitoringMapper mapper;


    public Response<Object> getAll() {
    /**
     *
     * @return
     */
    public Response<List<WaterQualityMonitoring>> getAllWaterQuality() {

        Response<List<WaterQualityMonitoring>> response = new Response<>();
        List<WaterQualityMonitoring> list = mapper.selectList(null);
        Response<Object> response = new Response<>();
        return response.set(1, list);
    }