锂电池监测维护一体化平台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
whyclxw
2024-09-21 12c0bb25a0540d97e7c3348e31c9b25a62495390 
 src/main/java/com/whyc/util/SubTablePageInfoUtil.java


@@ -102,29 +102,29 @@


            List<Date> queryTime = queryTimeForSubTables.get(key);


            //====== 根据不同类型类型对象对应调整 ======


            String tableName = key.equals("default") ? tablePrefix : tablePrefix + "_" + key;




           if (pojo instanceof DalmDto) {


                DalmDto dto = (DalmDto) pojo;


                dto.setStartTime(queryTime.get(0));


                dto.setEndTime(queryTime.get(1));




                List<Integer> limitList = tableAndLimitMap.get(key);


                dto.setLimitStart(limitList.get(0));


                dto.setLimitEnd(limitList.get(1));


                dto.setTableName(tableName);


                List<DevalarmDataYear> list =  service.getListDevAlm(dto);


               for (DevalarmDataYear year:list) {


                   int devId=year.getDevId();


                   int uid=year.getConfirmedUid();


                   DevInf dinf=dinfService.getDinfByDevId(devId);


                   UserInf uinf=uinfService.getUinfByUId(uid);


                   int almId=year.getAlmId();


                   String almName=DevAlmEnum.getValue(almId);


                   year.setAlmName(almName!=null?almName:"");


                   year.setDevInf(dinf);


                   year.setConfirmedUname(uinf!=null?uinf.getUname():"");


               if(!key.equals("default")){


                   DalmDto dto = (DalmDto) pojo;


                   dto.setStartTime(queryTime.get(0));


                   dto.setEndTime(queryTime.get(1));


                   List<Integer> limitList = tableAndLimitMap.get(key);


                   dto.setLimitStart(limitList.get(0));


                   dto.setLimitEnd(limitList.get(1));


                   dto.setTableName(tableName);


                   List<DevalarmDataYear> list =  service.getListDevAlm(dto);


                   for (DevalarmDataYear year:list) {


                       int devId=year.getDevId();


                       int uid=year.getConfirmedUid();


                       DevInf dinf=dinfService.getDinfByDevId(devId);


                       UserInf uinf=uinfService.getUinfByUId(uid);


                       int almId=year.getAlmId();


                       String almName=DevAlmEnum.getValue(almId);


                       year.setAlmName(almName!=null?almName:"");


                       year.setDevInf(dinf);


                       year.setConfirmedUname(uinf!=null?uinf.getUname():"");


                   }


                   dataList.addAll(list);


               }


                dataList.addAll(list);


            }


        }


        pageInfo.setList(dataList);