Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

he wei

2022-12-01 7b8758054b52e369710e8625d893eec8293ab166

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager

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

@@ -30,7 +30,8 @@
                                       , @RequestParam(required = false,defaultValue = "2222-01-01 00:00:00") String endTime
                                       , @RequestParam(required = false) String battVol
                                       ,@RequestParam(required = false ,defaultValue = "1") int pageCurr
                                        ,@RequestParam(required = false ,defaultValue = "10") int pageSize)  {
                                       ,@RequestParam(required = false ,defaultValue = "10") int pageSize
                                       ,@RequestParam(required = false ,defaultValue = "0") int flag)  {
        Date testTime1= null;
        Date testTime2= null;
        try {
@@ -39,7 +40,7 @@
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize);
        return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize,flag);
    }
    @ApiOperation("删除基站下数据")
    @GetMapping("deleteDataById")

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

@@ -152,14 +152,16 @@
        List<Integer> list=mapper.getMonVolStd();
        return new Response().setII(1,list.size()>0,list,"返回所有的标称电压类型");
    }
    //按照筛选条件查询数据库信息
    public Response getDataByCondition(Date testTime1, Date testTime2, String battVol,int pageCurr,int pageSize) {
    //按照筛选条件查询数据库信息(内阻评价：内阻越大越差)，然后再根据内阻手动分页
    public Response getDataByCondition(Date testTime1, Date testTime2, String battVol,int pageCurr,int pageSize,int flag) {
        PageHelper.startPage(pageCurr,pageSize);
        List<FileParam> list=mapper.getDataByCondition(testTime1,testTime2,Float.valueOf(battVol));
        List flagList=new ArrayList();//存放评价结果
        QueryWrapper testParamWrapper=new QueryWrapper();
        testParamWrapper.eq("enabled",1);
        TestParam testParam=testParamMapper.selectOne(testParamWrapper);
        float std=0f;
        int resFlag=0;//整组内阻标识，1差，2良，3优
        if(list!=null&&list.size()>0){
            for (FileParam fparam:list) {
                List<BattgroupInfo> binfInfoList=fparam.getBattInfoList();
@@ -167,7 +169,7 @@
                if(binfInfoList!=null&&binfInfoList.size()>0){
                    for (BattgroupInfo binfo:binfInfoList) {
                        List<BattgroupData> binfDataList=binfo.getBattDataList();
                        float minStd=9999999.0f;
                        float maxStd=0f;
                        List listBv=new ArrayList();
                        List listBr=new ArrayList();
                        List listBs=new ArrayList();
@@ -178,22 +180,30 @@
                                listBr.add(Float.valueOf(bData.getBr()));
                                listBs.add(Float.valueOf(bData.getBs()));
                                listCr.add(Float.valueOf(bData.getCr()));
                                if( Float.parseFloat(bData.getBr())<=minStd){
                                    minStd= Float.parseFloat(bData.getBr());
                                if( Float.parseFloat(bData.getBr())>=maxStd){
                                    maxStd= Float.parseFloat(bData.getBr());
                                }
                            }
                            binfo.setSdBasebv(MathUtil.getStandardDeviation(listBv));
                            binfo.setSdBasebr(MathUtil.getStandardDeviation(listBr));
                            binfo.setSdBasebs(MathUtil.getStandardDeviation(listBs));
                            binfo.setSdBasecr(MathUtil.getStandardDeviation(listCr));
                            binfo.setBrJudge(MathUtil.getJudge(minStd,std,testParam));
                            resFlag=MathUtil.getflag(maxStd,std,testParam);
                            binfo.setBrJudge(MathUtil.getJudge(resFlag));
                        }
                    }
                }
                if(flag==0){//为0是全部
                    flagList.add(fparam);
                }else{
                    if(flag==resFlag){
                        flagList.add(fparam);
                    }
                }
            }
        }
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list.size()>0,pageInfo,"筛选数据库信息");
        PageInfo pageInfo=new PageInfo(flagList);
        return new Response().setII(1,flagList.size()>0,pageInfo,"筛选数据库信息");
    }

    public FileParam getByFileId(String fileId) {

 src/main/java/com/whyc/util/MathUtil.java

@@ -25,23 +25,33 @@
        double σ = Math.sqrt(s.doubleValue());
        return BigDecimal.valueOf(σ).setScale(4, RoundingMode.HALF_UP).floatValue();
    }
    //评判整组的好坏flag:1 电压； 2 内阻；3 连接条
    public static String getJudge(float minStd, float std, TestParam testParam){
        String judge="未知";
    //评判整组的好坏flag:1差，2良，3优 电压； 内阻越大越不好
    public static int getflag(float maxStd, float std, TestParam testParam){
        int flag=0;
        float judgeStdLow=0f;
        float judgeStdHigh=0f;
        minStd=minStd*100;
        maxStd=maxStd*100;
        if (testParam!=null){
            judgeStdLow=std*testParam.getResGoodCoeK3();
            judgeStdHigh=std*testParam.getResBadCoeK4();
            if(minStd<=judgeStdLow){
                judge="差";
            }else if(minStd<=judgeStdHigh){
                judge="良";
            if(maxStd>=judgeStdHigh){
                flag=1;//"差"
            }else if(maxStd>=judgeStdLow){
                flag=2;//"良";
            }else{
                judge="优";
                flag=3;//"优";
            }
        }
        return flag;
    }
    //评判整组的好坏flag:1 电压； 内阻越大越不好
    public static String getJudge(int flag){
        String judge="未知";
        switch (flag){
            case 1:judge="差";break;
            case 2:judge="良";break;
            case 3:judge="优";break;
        }
        return judge;
    }