From a4b1211038c6307da6bf6ef924440dc203b27502 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 17 Apr 2025 14:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E5=85=BC=E5=AE=B9=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/controller/PqIcdPathController.java | 2 +- .../device/pq/mapper/mapping/LineMapper.xml | 4 +- .../service/impl/CustomReportServiceImpl.java | 161 ++++++++---------- 3 files changed, 71 insertions(+), 96 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqIcdPathController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqIcdPathController.java index e7311ef00..208d898dd 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqIcdPathController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqIcdPathController.java @@ -75,7 +75,7 @@ public class PqIcdPathController extends BaseController { @ApiOperation("更新icd模型") @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) - @PostMapping("addIcdPath") + @PostMapping("updateIcdPath") public HttpResult updateIcdPath(@RequestBody PqIcdPathParam.PqIcdPathUpdateParam pqIcdPathUpdateParam){ String methodDescribe = getMethodDescribe("updateIcdPath"); Boolean result = pqIcdPathService.updateIcdPath(pqIcdPathUpdateParam); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 4308d9eda..f34f1a58d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -1491,8 +1491,8 @@ SELECT line.id AS lineId, concat(sub.name,'_',vo.name,'_',line.name) as lineName, - concat(round(detail.pt1,0),concat(':',round(detail.pt2,0))) as pt, - concat(round(detail.ct1,0),concat(':',round(detail.ct2,0))) as ct, + CONCAT(NVL(TO_CHAR(detail.pt1, 'FM9999999999'), 'N/A'), ':', NVL(TO_CHAR(detail.pt2, 'FM9999999999'), 'N/A')) AS pt, + CONCAT(NVL(TO_CHAR(detail.ct1, 'FM9999999999'), 'N/A'), ':', NVL(TO_CHAR(detail.ct2, 'FM9999999999'), 'N/A')) AS ct, detail.Dev_Capacity as Dev_Capacity, detail.Short_Capacity as Short_Capacity, detail.Standard_Capacity as Standard_Capacity, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index ecfaeb426..685354347 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.date.TimeInterval; import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.StrBuilder; import cn.hutool.core.text.StrPool; @@ -121,6 +122,7 @@ public class CustomReportServiceImpl implements CustomReportService { @Override public void getCustomReport(ReportSearchParam reportSearchParam, HttpServletResponse response) { + TimeInterval timeInterval = new TimeInterval(); ExcelRptTemp excelRptTemp = excelRptTempMapper.selectById(reportSearchParam.getTempId()); if (Objects.isNull(excelRptTemp)) { throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_ACTIVE); @@ -132,6 +134,8 @@ public class CustomReportServiceImpl implements CustomReportService { //浙江无线报表 analyzeReportZhejiang(reportSearchParam, excelRptTemp, response); } + + log.info("报表执行时间{}秒",timeInterval.intervalSecond()); } @@ -660,8 +664,6 @@ public class CustomReportServiceImpl implements CustomReportService { - /* - */ /** * @param data 同类型的cell模板 * @param sql 单个cell模板 @@ -669,9 +671,9 @@ public class CustomReportServiceImpl implements CustomReportService { * @param limitMap 指标是否合格模板 * @param assNoPassMap 用于存储不合格的指标 * @date 2023/10/20 - *//* + */ - private void assSqlNew(List data, StringBuilder sql, List endList, String method, ReportSearchParam reportSearchParam, Map limitMap, Map overLimitMap, Map assNoPassMap) { + private void assSqlByMysql(List data, StringBuilder sql, List endList, String method, ReportSearchParam reportSearchParam, Map limitMap, Map overLimitMap, Map assNoPassMap) { //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai') if (InfluxDbSqlConstant.CP95.equals(method)) { for (int i = 0; i < data.size(); i++) { @@ -680,15 +682,15 @@ public class CustomReportServiceImpl implements CustomReportService { .append(InfluxDbSqlConstant.LBK) .append(data.get(i).getTemplateName()) .append(InfluxDbSqlConstant.RBK) - .append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM) - .append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM); + .append(InfluxDbSqlConstant.AS) + .append(data.get(i).getItemName()); } else { sql.append(InfluxDbSqlConstant.MAX) .append(InfluxDbSqlConstant.LBK) .append(data.get(i).getTemplateName()) .append(InfluxDbSqlConstant.RBK) - .append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM) - .append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM).append(StrUtil.COMMA); + .append(InfluxDbSqlConstant.AS) + .append(data.get(i).getItemName()).append(StrUtil.COMMA); } } } else { @@ -698,15 +700,15 @@ public class CustomReportServiceImpl implements CustomReportService { .append(InfluxDbSqlConstant.LBK) .append(data.get(i).getTemplateName()) .append(InfluxDbSqlConstant.RBK) - .append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM) - .append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM); + .append(InfluxDbSqlConstant.AS) + .append(data.get(i).getItemName()); } else { sql.append(method) .append(InfluxDbSqlConstant.LBK) .append(data.get(i).getTemplateName()) .append(InfluxDbSqlConstant.RBK) - .append(InfluxDbSqlConstant.AS).append(InfluxDbSqlConstant.DQM) - .append(data.get(i).getItemName()).append(InfluxDbSqlConstant.DQM).append(StrUtil.COMMA); + .append(InfluxDbSqlConstant.AS) + .append(data.get(i).getItemName()).append(StrUtil.COMMA); } } @@ -759,22 +761,15 @@ public class CustomReportServiceImpl implements CustomReportService { System.out.println(sql); - long l = System.currentTimeMillis(); - - - List> mapList = SqlRunner.db().selectList(sql.toString()); - - long la = System.currentTimeMillis(); - System.out.println("当前sql结束花费时长：" + (la - l) + "ms"); - if (CollUtil.isEmpty(mapList)) { + List> mapList = SqlRunner.DEFAULT.selectList(sql.toString()); + if (CollUtil.isEmpty(mapList) || Objects.isNull(mapList.get(0))) { data = data.stream().peek(item -> item.setValue("/")).collect(Collectors.toList()); } else { - Map map = mapList.get(0); + Map map = convertKeysToUpperCase(mapList.get(0)); for (ReportTemplateDTO item : data) { - if (Objects.nonNull(map) && map.containsKey(item.getItemName())) { + if (map.containsKey(item.getItemName())) { double v = Double.parseDouble(map.get(item.getItemName()).toString()); item.setValue(String.format("%.3f", v)); - if (overLimitMap.containsKey(item.getLimitName())) { Float tagVal = overLimitMap.get(item.getLimitName()); if (v > tagVal) { @@ -785,8 +780,8 @@ public class CustomReportServiceImpl implements CustomReportService { } //判断是否越限 - if (limitMap.size() != 0) { - String key = item.getLimitName() + "#" + item.getStatMethod().toLowerCase() + "#pq_overlimit"; + if (!limitMap.isEmpty()) { + String key = item.getLimitName() + "#" + item.getStatMethod() + "#PQ_OVERLIMIT"; if (limitMap.containsKey(key)) { ReportTemplateDTO tem = limitMap.get(key); double limitVal = Double.parseDouble(tem.getValue()); @@ -807,7 +802,15 @@ public class CustomReportServiceImpl implements CustomReportService { endList.addAll(data); } -*/ + + public static Map convertKeysToUpperCase(Map originalMap) { + Map newMap = new HashMap<>(); + for (Map.Entry entry : originalMap.entrySet()) { + newMap.put(entry.getKey().toUpperCase(), entry.getValue()); + } + return newMap; + } + /** * 处理 @@ -819,8 +822,6 @@ public class CustomReportServiceImpl implements CustomReportService { private void analyzeReport(ReportSearchParam reportSearchParam, ExcelRptTemp excelRptTemp, HttpServletResponse response) { //定义一个线程集合 List> futures = new ArrayList<>(); - - long begin = System.currentTimeMillis(); //指标 List reportTemplateDTOList = new ArrayList<>(); //限值 @@ -832,11 +833,12 @@ public class CustomReportServiceImpl implements CustomReportService { jsonArray = new JSONArray(new JSONTokener(fileStream, new JSONConfig())); parseTemplate(jsonArray, reportTemplateDTOList, reportLimitList, terminalList); } catch (Exception e) { - throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON); + if(e instanceof BusinessException){ + throw new BusinessException(e.getMessage()); + }else { + throw new BusinessException(HarmonicResponseEnum.CUSTOM_REPORT_JSON); + } } - - long temEnd = System.currentTimeMillis(); - //处理指标是否合格 reportLimitList = new LinkedHashSet<>(reportLimitList).stream().sorted(Comparator.comparing(ReportTemplateDTO::getItemName)).collect(Collectors.toList()); Map limitMap = overLimitDeal(reportLimitList, reportSearchParam); @@ -850,9 +852,6 @@ public class CustomReportServiceImpl implements CustomReportService { Map> classMap = reportTemplateDTOList.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getResourceId)); //定义存放越限指标的map Map assNoPassMap = new HashMap<>(); - long deal = System.currentTimeMillis(); - - classMap.forEach((classKey, templateValue) -> { Map> valueTypeMap = templateValue.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getStatMethod)); //每张表开启一个独立线程查询 @@ -862,16 +861,15 @@ public class CustomReportServiceImpl implements CustomReportService { //相别分组 Map> phaseMap = valueTypeVal.stream().collect(Collectors.groupingBy(ReportTemplateDTO::getPhase)); phaseMap.forEach((phaseKey, phaseVal) -> { - StringBuilder sql = new StringBuilder(InfluxDbSqlConstant.SELECT); if (InfluxDbSqlConstant.MAX.equalsIgnoreCase(valueTypeKey)) { - assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.MAX, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); + assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.MAX, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); } else if (InfluxDbSqlConstant.MIN.equalsIgnoreCase(valueTypeKey)) { - assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); + assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.MIN, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); } else if (InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(valueTypeKey)) { - assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.AVG, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); + assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.AVG_WEB, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); } else if (InfluxDbSqlConstant.CP95.equalsIgnoreCase(valueTypeKey)) { - assSqlNew(phaseVal, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); + assSqlByMysql(phaseVal, sql, endList, InfluxDbSqlConstant.CP95, reportSearchParam, limitTargetMapX, limitMap, assNoPassMap); } }); @@ -886,20 +884,16 @@ public class CustomReportServiceImpl implements CustomReportService { future.get(); // 这会阻塞直到任务完成或抛出异常 } catch (InterruptedException | ExecutionException e) { e.printStackTrace(); + log.error("自定义报表多线程查询流程出错！错误信息{}",e.getMessage()); } } //处理指标最终判定合格还是不合格 dealTargetResult(assNoPassMap, limitTargetMapX, endList); - - long dealEnd = System.currentTimeMillis(); - System.out.println("模板解析时间：" + (temEnd - begin) / 1000 + "S"); - System.out.println("查询数据库花费时间" + (dealEnd - deal) / 1000 + "S"); } if (CollUtil.isNotEmpty(endList)) { - long jie = System.currentTimeMillis(); //数据单位信息 Map unit = unitMap(reportSearchParam); //进行反向赋值到模板 @@ -909,11 +903,10 @@ public class CustomReportServiceImpl implements CustomReportService { Map finalTerminalMap; if (CollUtil.isNotEmpty(terminalList)) { finalTerminalMap = commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData(); + convertKeysToUpperCase(finalTerminalMap); }else { finalTerminalMap = new HashMap<>(); } - - //2、把itemName的value赋给v和m jsonArray.forEach(item -> { JSONObject jsonObject = (JSONObject) item; @@ -928,7 +921,7 @@ public class CustomReportServiceImpl implements CustomReportService { //数据格式：$HA[_25]#B#max#classId$ 或 $HA[_25]#max#classId$ if (v.charAt(0) == '$' && v.contains("#")) { String str = ""; - List rDto = assMap.get(v.replace("$", "")); + List rDto = assMap.get(v.replace("$", "").toUpperCase()); if (Objects.nonNull(rDto)) { str = rDto.get(0).getValue(); //没有值，赋"/" @@ -943,7 +936,7 @@ public class CustomReportServiceImpl implements CustomReportService { } else if (v.charAt(0) == '%' && v.contains("#")) { //指标合格情况 String str = ""; - List rDto = assMap.get(v.replace("%", "")); + List rDto = assMap.get(v.replace("%", "").toUpperCase()); if (Objects.nonNull(rDto)) { str = rDto.get(0).getValue(); //没有值，赋"/" @@ -957,16 +950,10 @@ public class CustomReportServiceImpl implements CustomReportService { } } else if (v.charAt(0) == '&') { //结论 - String tem = v.replace("&", ""); + String tem = v.replace("&", "").toUpperCase(); if (Objects.nonNull(finalTerminalMap)) { - if ("statis_time".equals(tem)) { + if ("STATIS_TIME".equals(tem)) { //如何时间是大于当前时间则用当前时间 -// String localTime = InfluxDbSqlConstant.END_TIME; -// LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN); -// if(LocalDate.now().isEqual(localDate)){ -// localTime =" "+ LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER); -// } -// son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime); String localTime = InfluxDbSqlConstant.END_TIME; LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN); LocalDate nowDate = LocalDate.now(); @@ -992,32 +979,20 @@ public class CustomReportServiceImpl implements CustomReportService { } }); }); - long jieEnd = System.currentTimeMillis(); - - System.out.println("组装信息耗时 " + (jieEnd - jie) / 1000 + "S"); } - - - long daochu = System.currentTimeMillis(); //导出自定义报表 downReport(jsonArray, response); - long daochuEnd = System.currentTimeMillis(); - System.out.println("导出耗时 " + (daochuEnd - daochu) / 1000 + "S"); - } /** * 解析模板 - * * @author cdf * @date 2023/10/20 */ - private void parseTemplate(JSONArray - jsonArray, List reportTemplateDTOList, List reportLimitList, List terminalList) { + private void parseTemplate(JSONArray jsonArray, List reportTemplateDTOList, List reportLimitList, List terminalList) { try { //通过文件服务器获取 - jsonArray.forEach(item -> { JSONObject jsonObject = (JSONObject) item; JSONArray itemArr = (JSONArray) jsonObject.get("celldata"); @@ -1034,47 +1009,46 @@ public class CustomReportServiceImpl implements CustomReportService { v = v.replace("$", ""); //封装ReportTemplateDTO ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO(); - reportTemplateDTO.setItemName(v); + reportTemplateDTO.setItemName(v.toUpperCase()); //根据#分割数据 String[] vItem = v.split("#"); if (vItem.length == 5) { //$HA[_25]#B#max#classId$ - reportTemplateDTO.setTemplateName(vItem[0]); - reportTemplateDTO.setPhase(vItem[1].substring(0, 1)); + reportTemplateDTO.setTemplateName(vItem[0].toUpperCase()); + reportTemplateDTO.setPhase(vItem[1].substring(0, 1).toUpperCase()); reportTemplateDTO.setStatMethod(vItem[2].toUpperCase()); - reportTemplateDTO.setResourceId(vItem[3]); - reportTemplateDTO.setLimitName(vItem[4]); + reportTemplateDTO.setResourceId(vItem[3].toUpperCase()); + reportTemplateDTO.setLimitName(vItem[4].toUpperCase()); } else if (vItem.length == 4) { //$HA[_25]#max#classId$ - reportTemplateDTO.setTemplateName(vItem[0]); + reportTemplateDTO.setTemplateName(vItem[0].toUpperCase()); reportTemplateDTO.setPhase("M"); reportTemplateDTO.setStatMethod(vItem[1].toUpperCase()); - reportTemplateDTO.setResourceId(vItem[2]); - reportTemplateDTO.setLimitName(vItem[3]); + reportTemplateDTO.setResourceId(vItem[2].toUpperCase()); + reportTemplateDTO.setLimitName(vItem[3].toUpperCase()); } reportTemplateDTOList.add(reportTemplateDTO); } else if (v.charAt(0) == '%' && v.contains("#")) { //封装ReportTemplateDTO ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO(); - v = v.replace("%", ""); - reportTemplateDTO.setItemName(v); + reportTemplateDTO.setItemName(v.toUpperCase()); //根据#分割数据 String[] vItem = v.split("#"); if (vItem.length == 3) { //$HA[_25]#B#max#classId$ - reportTemplateDTO.setTemplateName(vItem[0]); + reportTemplateDTO.setTemplateName(vItem[0].toUpperCase()); reportTemplateDTO.setStatMethod(vItem[1].toUpperCase()); - reportTemplateDTO.setResourceId(vItem[2]); + reportTemplateDTO.setResourceId(vItem[2].toUpperCase()); } reportLimitList.add(reportTemplateDTO); } else if (v.charAt(0) == '&') { //封装ReportTemplateDTO ReportTemplateDTO reportTemplateDTO = new ReportTemplateDTO(); v = v.replace("&", ""); - reportTemplateDTO.setItemName(v); - reportTemplateDTO.setTemplateName(v); + reportTemplateDTO.setItemName(v.toUpperCase()); + reportTemplateDTO.setTemplateName(v.toUpperCase()); terminalList.add(reportTemplateDTO); } } @@ -1097,18 +1071,18 @@ public class CustomReportServiceImpl implements CustomReportService { reportSearchParam) { Map limitMap = new HashMap<>(); if (CollUtil.isNotEmpty(reportLimitList)) { - StringBuilder sql = new StringBuilder("select "); + StringBuilder sql = new StringBuilder(InfluxDbSqlConstant.SELECT); for (int i = 0; i < reportLimitList.size(); i++) { if (i == reportLimitList.size() - 1) { - sql.append(reportLimitList.get(i).getTemplateName()); + sql.append(reportLimitList.get(i).getTemplateName()).append(StrUtil.C_SPACE); } else { - sql.append(reportLimitList.get(i).getTemplateName()).append(","); + sql.append(reportLimitList.get(i).getTemplateName()).append(StrUtil.COMMA); } } - sql.append(" from ").append(reportLimitList.get(0).getResourceId()).append(" where id ='").append(reportSearchParam.getLineId()).append("'"); + sql.append(InfluxDbSqlConstant.FROM).append(reportLimitList.get(0).getResourceId()).append(InfluxDbSqlConstant.WHERE).append("id ='").append(reportSearchParam.getLineId()).append("'"); limitMap = excelRptTempMapper.dynamicSqlMap(sql.toString()); if (Objects.isNull(limitMap)) { - throw new BusinessException("当前测点限值缺失!"); + throw new BusinessException("当前报表测点限值缺失!"); } for (ReportTemplateDTO item : reportLimitList) { @@ -1117,6 +1091,7 @@ public class CustomReportServiceImpl implements CustomReportService { } } } + limitMap = convertKeysToUpperCase(limitMap); return limitMap; } @@ -1570,7 +1545,7 @@ public class CustomReportServiceImpl implements CustomReportService { (Map assNoPassMap, Map limitTargetMapX, List endList) { assNoPassMap.forEach((key, val) -> { limitTargetMapX.remove(key); - if ("Voltage_Dev".equals(val.getTemplateName()) || "Freq_Dev".equals(val.getTemplateName())) { + if ("Voltage_Dev".toUpperCase().equals(val.getTemplateName()) || "Freq_Dev".toUpperCase().equals(val.getTemplateName())) { val.setValue("±" + val.getValue()); } if (val.getOverLimitFlag() == 1) { @@ -1626,14 +1601,14 @@ public class CustomReportServiceImpl implements CustomReportService { //$HA[_25]#B#max#classId$ reportTemplateDTO.setTemplateName(vItem[0]); reportTemplateDTO.setPhase(vItem[1]); - reportTemplateDTO.setStatMethod(vItem[2].toUpperCase()); + reportTemplateDTO.setStatMethod(vItem[2]); reportTemplateDTO.setResourceId(vItem[3]); reportTemplateDTO.setLimitName(vItem[4]); } else if (vItem.length == 4) { //$HA[_25]#max#classId$ reportTemplateDTO.setTemplateName(vItem[0]); reportTemplateDTO.setPhase("M"); - reportTemplateDTO.setStatMethod(vItem[1].toUpperCase()); + reportTemplateDTO.setStatMethod(vItem[1]); reportTemplateDTO.setResourceId(vItem[2]); reportTemplateDTO.setLimitName(vItem[3]); } @@ -1650,7 +1625,7 @@ public class CustomReportServiceImpl implements CustomReportService { if (vItem.length == 3) { //$HA[_25]#B#max#classId$ reportTemplateDTO.setTemplateName(vItem[0]); - reportTemplateDTO.setStatMethod(vItem[1].toUpperCase()); + reportTemplateDTO.setStatMethod(vItem[1]); reportTemplateDTO.setResourceId(vItem[2]); } reportLimitList.add(reportTemplateDTO);