密码验证加-

whyclxw

2025-05-28 e16302f9d475c7cc4dd18c5abf1a23cb5502e362

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

@@ -53,7 +53,7 @@
        }else{
            sqlend = calendar_start.get(Calendar.YEAR)+"%";
        }
        List<String> tableNameList = mapper.getTableNameList(deviceId+"_"+sqlend);
        List<String> tableNameList = mapper.getTableNameList("tb_pwrdev_historydata_"+deviceId+"_"+sqlend);
        //如果未查询到表名，则没有数据
        if (tableNameList.size()==0){
            return new Response().set(1, false, "数据表不存在");
@@ -76,7 +76,8 @@
                }
                //当结束时间与表名的月份相同时，获取结束时间前的数据
                if (Integer.valueOf(tableName.substring(tableName.length()-2))==endMonth){
                    List<PwrdevDataHistory> listMonth = mapper.getLtEndTime(tableName,endTime);
                    //List<PwrdevDataHistory> listMonth = mapper.getLtEndTime(tableName,endTime);
                    List<PwrdevDataHistory> listMonth = subService.getLtEndTime(tableName,endTime);
                    result.addAll(listMonth);
                }
            }
@@ -92,7 +93,8 @@
            for (String tableName: tableNameList ) {
                int month = calendar_start.get(Calendar.MONTH)+1;
                if (Integer.valueOf(tableName.substring(tableName.length()-2))==month){
                    List<PwrdevDataHistory> listMonth = mapper.getWeekOrDayData(tableName,startTime,endTime);
                    //List<PwrdevDataHistory> listMonth = mapper.getWeekOrDayData(tableName,startTime,endTime);
                    List<PwrdevDataHistory> listMonth = subService.getWeekOrDayData(tableName,startTime,endTime);
                    result.addAll(listMonth);
                }
            }