From c36b79d12ff42a9a23eec744afd07547aad3c996 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 十二月 2024 16:18:27 +0800
Subject: [PATCH] 修改
---
/dev/null | 57 ----------------------------
src/main/java/com/whyc/pojo/PowerInf.java | 7 ++-
src/main/java/com/whyc/service/PowerInfService.java | 14 +++----
3 files changed, 10 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/PowerBattRtMapper.java b/src/main/java/com/whyc/mapper/PowerBattRtMapper.java
deleted file mode 100644
index 69923e8..0000000
--- a/src/main/java/com/whyc/mapper/PowerBattRtMapper.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.whyc.mapper;
-
-import com.whyc.pojo.PowerBattRt;
-
-public interface PowerBattRtMapper extends CustomMapper<PowerBattRt>{
-}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/PowerBattRt.java b/src/main/java/com/whyc/pojo/PowerBattRt.java
deleted file mode 100644
index 6dd7878..0000000
--- a/src/main/java/com/whyc/pojo/PowerBattRt.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.whyc.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author lxw
- * @since 2024-12-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName(schema = "db_power_rt",value = "tb_power_batt_rt")
-@ApiModel(value="PowerBattRt瀵硅薄", description="")
-public class PowerBattRt implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "鑷涓婚敭")
- @TableId(value = "num", type = IdType.AUTO)
- private Long num;
-
- @ApiModelProperty(value = "鐢垫簮ID")
- private Integer powerId;
-
- @ApiModelProperty(value = "璁板綍鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date recordTime;
-
- @ApiModelProperty(value = "鍗曚綋缂栧彿")
- private Integer monNum;
-
- @ApiModelProperty(value = "鍗曚綋鐢靛帇")
- private Float monVol;
-
- @ApiModelProperty(value = "鍗曚綋鍐呴樆")
- private Float monRes;
-
- @ApiModelProperty(value = "鍗曚綋娓╁害")
- private Float monTmp;
-
-
-}
diff --git a/src/main/java/com/whyc/pojo/PowerInf.java b/src/main/java/com/whyc/pojo/PowerInf.java
index 02a9415..962f1e3 100644
--- a/src/main/java/com/whyc/pojo/PowerInf.java
+++ b/src/main/java/com/whyc/pojo/PowerInf.java
@@ -53,13 +53,14 @@
@ApiModelProperty("鐢垫簮绫诲瀷锛�1<鍖呭惈鐢垫簮瀹炴椂rt>锛�2<鍖呭惈鐢垫簮瀹炴椂rt>锛�3<涓嶅寘鍚數婧愬疄鏃秗t>")
private Integer devType;
+ @TableField("binf_id")
+ @ApiModelProperty("鐢垫睜id")
+ private Integer binfId;
+
@TableField("binf_name")
@ApiModelProperty("鐢垫睜缁勫悕绉�")
private String binfName;
- @TableField("mon_count")
- @ApiModelProperty("鐢垫睜缁勫崟浣撴�绘暟")
- private Integer monCount;
@TableField("mon_vol")
@ApiModelProperty("鐢垫睜缁勬爣绉扮數鍘�")
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 8123cf4..8a0f107 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -1,11 +1,9 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.whyc.dto.Response;
import com.whyc.mapper.*;
-import com.whyc.pojo.PowerBattRt;
import com.whyc.pojo.PowerInf;
-import com.whyc.pojo.PowerRealRt1;
+import com.whyc.pojo.RtData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,7 +17,7 @@
private PowerInfMapper mapper;
@Autowired(required = false)
- private PowerBattRtMapper powerRtmapper;
+ private RtDataMapper rtDataMapper;
@Autowired(required = false)
private PowerRealRt1Mapper realRt1Mapper;
@@ -40,7 +38,7 @@
Integer devType=pinf.getDevType();
map.put("devType",devType);
if(devType!=3){//绗笁绉嶄笉鍖呭惈鍗曚綋瀹炴椂
- List<PowerBattRt> list=getBattRt(powerId);
+ List<RtData> list=getBattRt(pinf.getBinfId());
map.put("battRt",list);
}
Object obj=getRealRt(powerId,devType);
@@ -66,10 +64,10 @@
}
//鑾峰彇鐢垫簮鐢垫睜缁勪俊鎭�
- private List<PowerBattRt> getBattRt(int powerId) {
+ private List<RtData> getBattRt(int binfId) {
QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("power_id",powerId);
- List<PowerBattRt> list=mapper.selectList(wrapper);
+ wrapper.eq("binf_id",binfId);
+ List<RtData> list=rtDataMapper.selectList(wrapper);
return list;
}
}
\ No newline at end of file
--
Gitblit v1.9.1