diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index adaee002f..5f6551df9 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -1090,8 +1090,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { List reasonData = reason.getData(); List typeData = type.getData(); - HashMap reasonMap = new HashMap<>(); - HashMap typeMap = new HashMap<>(); + Map reasonMap = new LinkedHashMap<>(); + Map typeMap = new LinkedHashMap<>(); //添加detail diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java index 744276676..ef0ac4b7f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java @@ -131,10 +131,9 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService { List intervalTime = PubUtils.getIntervalTime(steadyExceedCensusParam.getSearchBeginTime(),steadyExceedCensusParam.getSearchEndTime()); for (String interTime : intervalTime) { String startTime = PublicDateUtil.getFisrtDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5))); - String endTime = PublicDateUtil.getLastDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5))); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); Date dt = simpleDateFormat.parse(startTime); - Date dtDate = simpleDateFormat.parse(endTime); + Date dtDate = simpleDateFormat.parse(steadyExceedCensusParam.getSearchEndTime()); Integer year = Integer.valueOf(String.format("%tY", dt)); Integer mon = Integer.valueOf(String.format("%tm", dt)); Integer day = Integer.valueOf(String.format("%td", dtDate)); @@ -203,14 +202,9 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService { List string = new ArrayList<>(); int beginMouthTime = Integer.parseInt(searchBeginTime.substring(5, 7)); int endMouthTime = Integer.parseInt(searchEndTime.substring(5, 7)); - int a =0; - for (int i =0; i