diff --git a/detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java index da7122a8..207eabcb 100644 --- a/detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java @@ -103,7 +103,7 @@ public class PreDetection { /** * 监测点线路号 */ - @JSONField(name = "pt") + @JSONField(name = "pt") //todo 是否改为ct private Integer ct; } diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 8240cd8d..230a4cdd 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -622,7 +622,11 @@ public class AdPlanServiceImpl extends ServiceImpl impleme String[] rateStrArr = rows.get(rows.size() - 1); Double[] rateArr = new Double[maxTime]; for (int i = 1; i < rateStrArr.length; i++) { - rateArr[i - 1] = Double.parseDouble(rateStrArr[i].replace("%", "")); + if("/".equals(rateStrArr[i])){ + rateArr[i - 1] = 0.00; + }else{ + rateArr[i - 1] = Double.parseDouble(rateStrArr[i].replace("%", "")); + } } XDDFNumericalDataSource rate = XDDFDataSourcesFactory.fromArray(rateArr); @@ -638,14 +642,14 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // 图表加载数据,条形图1 bar.addSeries(checkTimes, rate); -// CTPlotArea plotArea = chart.getCTChart().getPlotArea(); -// -// CTBarSer serArray = plotArea.getBarChartArray(0).getSerArray(0); -// serArray.addNewDLbls(); -// serArray.getDLbls().addNewShowVal().setVal(true); -// serArray.getDLbls().addNewShowLegendKey().setVal(false); -// serArray.getDLbls().addNewShowCatName().setVal(false); -// serArray.getDLbls().addNewShowSerName().setVal(false); + CTPlotArea plotArea = chart.getCTChart().getPlotArea(); + + CTBarSer serArray = plotArea.getBarChartArray(0).getSerArray(0); + serArray.addNewDLbls(); + serArray.getDLbls().addNewShowVal().setVal(true); + serArray.getDLbls().addNewShowLegendKey().setVal(false); + serArray.getDLbls().addNewShowCatName().setVal(false); + serArray.getDLbls().addNewShowSerName().setVal(false); // 打印图表的xml //System.out.println(chart.getCTChart());