whyczh
2021-03-25 337a7dfa5a6613e7c95d505c8ed016fbd11a425f
更新MotorState接口
6个文件已添加
2个文件已修改
765 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/MotorStateController.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/MotorStateMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/WaterRtMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/MotorState.java 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/WaterRt.java 477 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/MotorStateService.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/MotorState.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WaterRt.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/MotorStateController.java
New file
@@ -0,0 +1,48 @@
package com.whyc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.whyc.dto.Response;
import com.whyc.pojo.MotorState;
import com.whyc.service.MotorStateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("motor")
@Api(tags = "电机")
@Slf4j
public class MotorStateController {
    @Resource
    private MotorStateService motorStateService;
    @PostMapping
    @ApiOperation("添加")
    public Response add(@RequestBody MotorState motorState){
        return motorStateService.add(motorState);
    }
    @PutMapping
    @ApiOperation("编辑")
    public Response update(@RequestBody MotorState motorState){
        return motorStateService.update(motorState);
    }
    @GetMapping
    @ApiOperation("查询by设备id")
    public Response getMontorState(@RequestParam int deviceId){
        return motorStateService.getById(deviceId);
    }
    /*@PutMapping("delete")
    public Response delete(@RequestParam Integer deviceId){
        return motorStateService.delete(deviceId);
    }*/
    @GetMapping("/all")
    @ApiOperation("查询所有")
    public Response<IPage<MotorState>> getAll(@RequestParam int pageNum,@RequestParam int pageSize){
        return motorStateService.getAll(pageNum,pageSize);
    }
}
src/main/java/com/whyc/mapper/MotorStateMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.MotorState;
public interface MotorStateMapper extends CustomMapper<MotorState>{
}
src/main/java/com/whyc/mapper/WaterRtMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.WaterRt;
public interface WaterRtMapper extends CustomMapper<WaterRt> {
}
src/main/java/com/whyc/pojo/MotorState.java
@@ -1,2 +1,146 @@
package com.whyc.pojo;public class MotorState {
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.ibatis.type.Alias;
import java.util.Date;
/**
 * 电机状态实时数据
 */
@Alias("MotorState")
@TableName(schema = "`db_experiment`",value = "`tb_motor_state`")
public class MotorState {
    private Integer num;
    /**设备id**/
    private Integer deviceId;
    /**记录时间**/
    @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    private Date recordTime;
    /**电机电流 **/
    private Float motorCurr;
    /**电机功率**/
    private Float motorPower;
    /**电机转速 **/
    private Float motorSpeed;
    /**电机电压 **/
    private Float motorVol;
    /**电机出口温度 **/
    private Float motorOutTmp;
    /**电机进口温度**/
    private Float motorIntoTmp;
    /**电机转矩**/
    private Float motorTorque;
    /**电机状态 **/
    private Integer motorState;
    public MotorState() {
    }
    @Override
    public String toString() {
        return "MotorState{" +
                "num=" + num +
                ", deviceId=" + deviceId +
                ", recordTime=" + recordTime +
                ", motorCurr=" + motorCurr +
                ", motorPower=" + motorPower +
                ", motorSpeed=" + motorSpeed +
                ", motorVol=" + motorVol +
                ", motorOutTmp=" + motorOutTmp +
                ", motorIntoTmp=" + motorIntoTmp +
                ", motorTorque=" + motorTorque +
                ", motorState=" + motorState +
                '}';
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public Integer getDeviceId() {
        return deviceId;
    }
    public void setDeviceId(Integer deviceId) {
        this.deviceId = deviceId;
    }
    public Date getRecordTime() {
        return recordTime;
    }
    public void setRecordTime(Date recordTime) {
        this.recordTime = recordTime;
    }
    public Float getMotorCurr() {
        return motorCurr;
    }
    public void setMotorCurr(Float motorCurr) {
        this.motorCurr = motorCurr;
    }
    public Float getMotorPower() {
        return motorPower;
    }
    public void setMotorPower(Float motorPower) {
        this.motorPower = motorPower;
    }
    public Float getMotorSpeed() {
        return motorSpeed;
    }
    public void setMotorSpeed(Float motorSpeed) {
        this.motorSpeed = motorSpeed;
    }
    public Float getMotorVol() {
        return motorVol;
    }
    public void setMotorVol(Float motorVol) {
        this.motorVol = motorVol;
    }
    public Float getMotorOutTmp() {
        return motorOutTmp;
    }
    public void setMotorOutTmp(Float motorOutTmp) {
        this.motorOutTmp = motorOutTmp;
    }
    public Float getMotorIntoTmp() {
        return motorIntoTmp;
    }
    public void setMotorIntoTmp(Float motorIntoTmp) {
        this.motorIntoTmp = motorIntoTmp;
    }
    public Float getMotorTorque() {
        return motorTorque;
    }
    public void setMotorTorque(Float motorTorque) {
        this.motorTorque = motorTorque;
    }
    public Integer getMotorState() {
        return motorState;
    }
    public void setMotorState(Integer motorState) {
        this.motorState = motorState;
    }
}
src/main/java/com/whyc/pojo/WaterRt.java
@@ -1,2 +1,477 @@
package com.whyc.pojo;public class WaterRt {
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.ibatis.type.Alias;
import java.util.Date;
/**
 * 水冷系统
 */
@Alias("WaterRt")
@TableName(schema = "`db_experiment`",value = "`tb_water_rt`")
public class WaterRt {
    @TableId
    private Integer num;
    /**水冷系统id**/
    private Integer waterId;
    /**记录时间**/
    @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    private Date recordTime;
    /**1#支路流量**/
    private Float branchFlow1;
    private Float branchFlow2;
    private Float branchFlow3;
    private Float branchFlow4;
    private Float branchFlow5;
    private Float branchFlow6;
    private Float branchFlow7;
    private Float branchFlow8;
    private Float branchFlow9;
    /**1#支路温度**/
    private Float branchTmp1;
    private Float branchTmp2;
    private Float branchTmp3;
    private Float branchTmp4;
    private Float branchTmp5;
    private Float branchTmp6;
    private Float branchTmp7;
    private Float branchTmp8;
    private Float branchTmp9;
    /**1#支路压力**/
    private Float branchPre1;
    private Float branchPre2;
    private Float branchPre3;
    private Float branchPre4;
    private Float branchPre5;
    private Float branchPre6;
    private Float branchPre7;
    private Float branchPre8;
    private Float branchPre9;
    /**冷却水流量**/
    private Float coolingFlow;
    /**供水温度**/
    private Float supplyTmp;
    /**供水压力**/
    private Float supplyPre;
    /**回水温度**/
    private Float backTem;
    /**回水压力**/
    private Float backPre;
    /**冷却水电导率**/
    private Float coolingSer;
    /**缓冲罐液位**/
    private Float bufferTankLevel;
    /**缓冲罐压力**/
    private Float bufferTankPre;
    /**阀厅湿度**/
    private Float humidityChamber;
    /**阀厅温度**/
    private Float tmpChamber;
    /**外水温度**/
    private Float externalTmp;
    /**外水压力**/
    private Float externalPre;
    /**备注**/
    private String note;
    public WaterRt() {
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public Integer getWaterId() {
        return waterId;
    }
    public void setWaterId(Integer waterId) {
        this.waterId = waterId;
    }
    public Date getRecordTime() {
        return recordTime;
    }
    public void setRecordTime(Date recordTime) {
        this.recordTime = recordTime;
    }
    public Float getBranchFlow1() {
        return branchFlow1;
    }
    public void setBranchFlow1(Float branchFlow1) {
        this.branchFlow1 = branchFlow1;
    }
    public Float getBranchFlow2() {
        return branchFlow2;
    }
    public void setBranchFlow2(Float branchFlow2) {
        this.branchFlow2 = branchFlow2;
    }
    public Float getBranchFlow3() {
        return branchFlow3;
    }
    public void setBranchFlow3(Float branchFlow3) {
        this.branchFlow3 = branchFlow3;
    }
    public Float getBranchFlow4() {
        return branchFlow4;
    }
    public void setBranchFlow4(Float branchFlow4) {
        this.branchFlow4 = branchFlow4;
    }
    public Float getBranchFlow5() {
        return branchFlow5;
    }
    public void setBranchFlow5(Float branchFlow5) {
        this.branchFlow5 = branchFlow5;
    }
    public Float getBranchFlow6() {
        return branchFlow6;
    }
    public void setBranchFlow6(Float branchFlow6) {
        this.branchFlow6 = branchFlow6;
    }
    public Float getBranchFlow7() {
        return branchFlow7;
    }
    public void setBranchFlow7(Float branchFlow7) {
        this.branchFlow7 = branchFlow7;
    }
    public Float getBranchFlow8() {
        return branchFlow8;
    }
    public void setBranchFlow8(Float branchFlow8) {
        this.branchFlow8 = branchFlow8;
    }
    public Float getBranchFlow9() {
        return branchFlow9;
    }
    public void setBranchFlow9(Float branchFlow9) {
        this.branchFlow9 = branchFlow9;
    }
    public Float getBranchTmp1() {
        return branchTmp1;
    }
    public void setBranchTmp1(Float branchTmp1) {
        this.branchTmp1 = branchTmp1;
    }
    public Float getBranchTmp2() {
        return branchTmp2;
    }
    public void setBranchTmp2(Float branchTmp2) {
        this.branchTmp2 = branchTmp2;
    }
    public Float getBranchTmp3() {
        return branchTmp3;
    }
    public void setBranchTmp3(Float branchTmp3) {
        this.branchTmp3 = branchTmp3;
    }
    public Float getBranchTmp4() {
        return branchTmp4;
    }
    public void setBranchTmp4(Float branchTmp4) {
        this.branchTmp4 = branchTmp4;
    }
    public Float getBranchTmp5() {
        return branchTmp5;
    }
    public void setBranchTmp5(Float branchTmp5) {
        this.branchTmp5 = branchTmp5;
    }
    public Float getBranchTmp6() {
        return branchTmp6;
    }
    public void setBranchTmp6(Float branchTmp6) {
        this.branchTmp6 = branchTmp6;
    }
    public Float getBranchTmp7() {
        return branchTmp7;
    }
    public void setBranchTmp7(Float branchTmp7) {
        this.branchTmp7 = branchTmp7;
    }
    public Float getBranchTmp8() {
        return branchTmp8;
    }
    public void setBranchTmp8(Float branchTmp8) {
        this.branchTmp8 = branchTmp8;
    }
    public Float getBranchTmp9() {
        return branchTmp9;
    }
    public void setBranchTmp9(Float branchTmp9) {
        this.branchTmp9 = branchTmp9;
    }
    public Float getBranchPre1() {
        return branchPre1;
    }
    public void setBranchPre1(Float branchPre1) {
        this.branchPre1 = branchPre1;
    }
    public Float getBranchPre2() {
        return branchPre2;
    }
    public void setBranchPre2(Float branchPre2) {
        this.branchPre2 = branchPre2;
    }
    public Float getBranchPre3() {
        return branchPre3;
    }
    public void setBranchPre3(Float branchPre3) {
        this.branchPre3 = branchPre3;
    }
    public Float getBranchPre4() {
        return branchPre4;
    }
    public void setBranchPre4(Float branchPre4) {
        this.branchPre4 = branchPre4;
    }
    public Float getBranchPre5() {
        return branchPre5;
    }
    public void setBranchPre5(Float branchPre5) {
        this.branchPre5 = branchPre5;
    }
    public Float getBranchPre6() {
        return branchPre6;
    }
    public void setBranchPre6(Float branchPre6) {
        this.branchPre6 = branchPre6;
    }
    public Float getBranchPre7() {
        return branchPre7;
    }
    public void setBranchPre7(Float branchPre7) {
        this.branchPre7 = branchPre7;
    }
    public Float getBranchPre8() {
        return branchPre8;
    }
    public void setBranchPre8(Float branchPre8) {
        this.branchPre8 = branchPre8;
    }
    public Float getBranchPre9() {
        return branchPre9;
    }
    public void setBranchPre9(Float branchPre9) {
        this.branchPre9 = branchPre9;
    }
    public Float getCoolingFlow() {
        return coolingFlow;
    }
    public void setCoolingFlow(Float coolingFlow) {
        this.coolingFlow = coolingFlow;
    }
    public Float getSupplyTmp() {
        return supplyTmp;
    }
    public void setSupplyTmp(Float supplyTmp) {
        this.supplyTmp = supplyTmp;
    }
    public Float getSupplyPre() {
        return supplyPre;
    }
    public void setSupplyPre(Float supplyPre) {
        this.supplyPre = supplyPre;
    }
    public Float getBackTem() {
        return backTem;
    }
    public void setBackTem(Float backTem) {
        this.backTem = backTem;
    }
    public Float getBackPre() {
        return backPre;
    }
    public void setBackPre(Float backPre) {
        this.backPre = backPre;
    }
    public Float getCoolingSer() {
        return coolingSer;
    }
    public void setCoolingSer(Float coolingSer) {
        this.coolingSer = coolingSer;
    }
    public Float getBufferTankLevel() {
        return bufferTankLevel;
    }
    public void setBufferTankLevel(Float bufferTankLevel) {
        this.bufferTankLevel = bufferTankLevel;
    }
    public Float getBufferTankPre() {
        return bufferTankPre;
    }
    public void setBufferTankPre(Float bufferTankPre) {
        this.bufferTankPre = bufferTankPre;
    }
    public Float getHumidityChamber() {
        return humidityChamber;
    }
    public void setHumidityChamber(Float humidityChamber) {
        this.humidityChamber = humidityChamber;
    }
    public Float getTmpChamber() {
        return tmpChamber;
    }
    public void setTmpChamber(Float tmpChamber) {
        this.tmpChamber = tmpChamber;
    }
    public Float getExternalTmp() {
        return externalTmp;
    }
    public void setExternalTmp(Float externalTmp) {
        this.externalTmp = externalTmp;
    }
    public Float getExternalPre() {
        return externalPre;
    }
    public void setExternalPre(Float externalPre) {
        this.externalPre = externalPre;
    }
    public String getNote() {
        return note;
    }
    public void setNote(String note) {
        this.note = note;
    }
    @Override
    public String toString() {
        return "WaterRt{" +
                "num=" + num +
                ", waterId=" + waterId +
                ", recordTime=" + recordTime +
                ", branchFlow1=" + branchFlow1 +
                ", branchFlow2=" + branchFlow2 +
                ", branchFlow3=" + branchFlow3 +
                ", branchFlow4=" + branchFlow4 +
                ", branchFlow5=" + branchFlow5 +
                ", branchFlow6=" + branchFlow6 +
                ", branchFlow7=" + branchFlow7 +
                ", branchFlow8=" + branchFlow8 +
                ", branchFlow9=" + branchFlow9 +
                ", branchTmp1=" + branchTmp1 +
                ", branchTmp2=" + branchTmp2 +
                ", branchTmp3=" + branchTmp3 +
                ", branchTmp4=" + branchTmp4 +
                ", branchTmp5=" + branchTmp5 +
                ", branchTmp6=" + branchTmp6 +
                ", branchTmp7=" + branchTmp7 +
                ", branchTmp8=" + branchTmp8 +
                ", branchTmp9=" + branchTmp9 +
                ", branchPre1=" + branchPre1 +
                ", branchPre2=" + branchPre2 +
                ", branchPre3=" + branchPre3 +
                ", branchPre4=" + branchPre4 +
                ", branchPre5=" + branchPre5 +
                ", branchPre6=" + branchPre6 +
                ", branchPre7=" + branchPre7 +
                ", branchPre8=" + branchPre8 +
                ", branchPre9=" + branchPre9 +
                ", coolingFlow=" + coolingFlow +
                ", supplyTmp=" + supplyTmp +
                ", supplyPre=" + supplyPre +
                ", backTem=" + backTem +
                ", backPre=" + backPre +
                ", coolingSer=" + coolingSer +
                ", bufferTankLevel=" + bufferTankLevel +
                ", bufferTankPre=" + bufferTankPre +
                ", humidityChamber=" + humidityChamber +
                ", tmpChamber=" + tmpChamber +
                ", externalTmp=" + externalTmp +
                ", externalPre=" + externalPre +
                ", note='" + note + '\'' +
                '}';
    }
}
src/main/java/com/whyc/service/MotorStateService.java
New file
@@ -0,0 +1,70 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.whyc.dto.Response;
import com.whyc.mapper.MotorStateMapper;
import com.whyc.pojo.MotorState;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
@Slf4j
public class MotorStateService {
    @Resource
    private MotorStateMapper motorStateMapper;
    public Response add(MotorState motorState){
        if(motorStateMapper.insert(motorState)>0){
            return new Response<>().set(1,true);
        }else{
            return new Response<>().set(0, false, "添加失败");
        }
    }
    public Response update(MotorState motorState){
        motorStateMapper.updateById(motorState);
        return new Response().set(1, true, "修改成功");
    }
    public List<MotorState> getAll(){
        return motorStateMapper.selectList(null);
    }
    /**
     * 分页查询
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response<IPage<MotorState>> getAll(int pageNum,int pageSize){
        QueryWrapper<MotorState> wrapper = Wrappers.query();
        IPage<MotorState> page = motorStateMapper.selectPage(new Page<>(pageNum,pageSize),wrapper);
        return new Response<IPage<MotorState>>().set(1,page);
    }
    public Response getById(int deviceId){
        QueryWrapper<MotorState> wrapper = Wrappers.query();
        wrapper.eq("device_id",deviceId);
        MotorState motorState = motorStateMapper.selectOne(wrapper);
        if(motorState!=null){
            return new Response().set(1,motorState);
        }else{
            return new Response().set(0,false,"未找到此电机数据");
        }
    }
    public boolean delete(int deviceId){
        return motorStateMapper.deleteById(deviceId)>0;
    }
}
src/main/resources/mapper/MotorState.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.MotorStateMapper" >
</mapper>
src/main/resources/mapper/WaterRt.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.WaterRtMapper" >
</mapper>