放电模式 （备注2）0:恒流模式,1:恒功率模式

whyclxw

2024-11-04 545ea56e994f4c725e9ad739bee20a11a03c3f6c

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

@@ -102,28 +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();
                   year.setAlmName(DevAlmEnum.getValue(almId));
                   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);