fix:测试提交

jinpengyong

2023-07-31 5cde48f1ba87e6cc7a79d9c5c3a967eff154fd02

fix:测试提交

 screen-api/src/main/java/com/moral/api/service/DustldService.java

@@ -12,10 +12,10 @@



    public  Integer  getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
     Integer  getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;


    public Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
     Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);


    Map<String,Object>  selectDust(Integer id );

 screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java

@@ -80,7 +80,30 @@
                String start = timeForm.getStart();
                String end = timeForm.getEnd();
                List<Double> dust = historySecondCruiserMapper.getDust(start, end, mac);
                list.addAll(dust);
                ArrayList<Double> rsDouble = new ArrayList<>();
                for (Double aDouble : dust) {
                    double v =0.0;
                    if (aDouble>=0 && aDouble<40 ){
                        v = aDouble + 170;
                    }
                    if (aDouble>=40 && aDouble<60 ){
                        v = aDouble + 130;
                    }
                    if (aDouble>=60 && aDouble<100 ){
                        v = aDouble + 110;
                    }
                    if (aDouble>=100 && aDouble<150 ){
                        v = aDouble + 70;
                    }
                    if (aDouble>=150 && aDouble<180 ){
                        v = aDouble + 30;
                    }
                    if (aDouble>=180){
                        v= aDouble;
                    }
                    rsDouble.add(v);
                }
                list.addAll(rsDouble);
            }
        }
        String format = "";