包机组下添加电源的验证修改

whyclxw

10 小时以前 cae57767c58673966d05a4d5d5855216fa3f07d4

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

@@ -46,17 +46,10 @@
        Set<String> tableYearKeySet = queryTimeForSubTables.keySet();
        for (String tableYear : tableYearKeySet) {
            List<Date> queryTime = queryTimeForSubTables.get(tableYear);

            String tableName;
            if(!tableYear.equals("default")){
                //数值
                tableName = tablePrefix+"_"+tableYear;
                String existTableName = commonMapper.existTable(dbName, tableName);
                if(existTableName == null){
                    continue;
                }
            }else{
                tableName = tablePrefix;
            String tableName=tablePrefix+"_"+tableYear;;
            String existTableName = commonMapper.existTable(dbName, tableName);
            if(existTableName == null){
                continue;
            }
            //====== 根据不同类型类型对象对应调整 ======
             if(pojo instanceof PwrAlmPar) {
@@ -147,7 +140,6 @@
        CountDownLatch latch = new CountDownLatch(tableYearListInDB.size());
        for (String tableYear : tableYearListInDB) {
            List<Date> queryTime = queryTimeForSubTables.get(tableYear);

            String tableName;
            if(!tableYear.equals("default")){
                //数值
@@ -156,7 +148,6 @@
                tableName = tablePrefix;
            }
            pool.execute(()-> {

                //====== 根据不同类型类型对象对应调整 ======
                if (pojo instanceof BattAlmPar) { //电池告警历史
                    BattAlmPar param = new BattAlmPar();
@@ -175,7 +166,6 @@
                    param.setRecordYear(tableName);
                    int currentCount = subService.getDevAlmHisCount(param);
                    queryCountMap.put(tableYear, currentCount);

                }

                latch.countDown();
@@ -226,7 +216,7 @@
                data.setLimitStart(limitList.get(0));
                data.setLimitEnd(limitList.get(1));
                data.setRecordYear(recordYear);
                List<BattAlarmRes> list = subService.getBattAlmHisList(data);
                List<BattalarmDataHistory> list = subService.getBattAlmHisList(data);
                dataList.addAll(list);
            }
            else if (pojo instanceof DevAlmPar) {