修改

whyclxw

2024-12-04 c36b79d12ff42a9a23eec744afd07547aad3c996

修改

 src/main/java/com/whyc/mapper/PowerBattRtMapper.java

File was deleted

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

File was deleted

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

@@ -53,13 +53,14 @@
    @ApiModelProperty("电源类型：1<包含电源实时rt>，2<包含电源实时rt>，3<不包含电源实时rt>")
    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("电池组标称电压")

 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;
    }
}