diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java index b03dbe6466..b1a25cf947 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java @@ -12,4 +12,8 @@ public interface ScreenConstant { String RATIO = "%"; + String SQUARE_BRACKETS = "[]"; + + String COMMA = ","; + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java index 8ee16c42f6..0727ebfbde 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java @@ -72,12 +72,12 @@ public class AgencyServiceImpl implements AgencyService { * @date 2020/8/26 5:18 下午 */ public List getCenterMark(String centerMark){ - if (centerMark.length() == NumConstant.ZERO) { + if (centerMark.length() == NumConstant.ZERO || centerMark.equals(ScreenConstant.SQUARE_BRACKETS)) { return new ArrayList<>(); } List result = new ArrayList<>(); - String substring = centerMark.substring(2, centerMark.length() - 2); - String[] split = substring.split(","); + String substring = centerMark.substring(NumConstant.TWO, centerMark.length() - NumConstant.TWO); + String[] split = substring.split(ScreenConstant.COMMA); for (String s : split) { result.add(Double.valueOf(s)); }