lxw
2022-10-11 efac00aebd0e447f7d3d6933d735e753e5e8fbac
均一性
2个文件已修改
45 ■■■■■ 已修改文件
src/main/java/com/whyc/pojo/BattgroupInfo.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/FileParamService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/BattgroupInfo.java
@@ -56,6 +56,22 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date testTime;
    @ApiModelProperty(value = "电压均一性")
    @TableField(exist = false)
    private Float sdBasebv;
    @ApiModelProperty(value = "内阻均一性")
    @TableField(exist = false)
    private Float sdBasebr;
    @ApiModelProperty(value = "电导均一性")
    @TableField(exist = false)
    private Float sdBasebs;
    @ApiModelProperty(value = "连接条均一性")
    @TableField(exist = false)
    private Float sdBasecr;
    public BattgroupInfo() {
        battDataList=new ArrayList<>();
    }
src/main/java/com/whyc/service/FileParamService.java
@@ -7,8 +7,11 @@
import com.whyc.dto.*;
import com.whyc.mapper.BattGroupDataMapper;
import com.whyc.mapper.FileParamMapper;
import com.whyc.pojo.BattgroupData;
import com.whyc.pojo.BattgroupInfo;
import com.whyc.pojo.FileInfo;
import com.whyc.pojo.FileParam;
import com.whyc.util.MathUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -127,6 +130,32 @@
    public Response getDataByCondition(Date testTime1, Date testTime2, int battVol,int pageCurr,int pageSize) {
        PageHelper.startPage(pageCurr,pageSize);
        List<FileParam> list=mapper.getDataByCondition(testTime1,testTime2,battVol);
        if(list!=null&&list.size()>0){
            for (FileParam fparam:list) {
                List<BattgroupInfo> binfInfoList=fparam.getBattInfoList();
                if(binfInfoList!=null&&binfInfoList.size()>0){
                    for (BattgroupInfo binfo:binfInfoList) {
                        List<BattgroupData> binfDataList=binfo.getBattDataList();
                        List listBv=new ArrayList();
                        List listBr=new ArrayList();
                        List listBs=new ArrayList();
                        List listCr=new ArrayList();
                        if(binfDataList!=null&&binfDataList.size()>0) {
                            for (BattgroupData bData : binfDataList) {
                                listBv.add(bData.getBv());
                                listBr.add(bData.getBr());
                                listBs.add(bData.getBs());
                                listCr.add(bData.getCr());
                            }
                            binfo.setSdBasebv(MathUtil.getStandardDeviation(listBv));
                            binfo.setSdBasebr(MathUtil.getStandardDeviation(listBr));
                            binfo.setSdBasebs(MathUtil.getStandardDeviation(listBs));
                            binfo.setSdBasecr(MathUtil.getStandardDeviation(listCr));
                        }
                    }
                }
            }
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list.size()>0,pageInfo,"筛选数据库信息");
    }