Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.稳态占比bug修改

Browse Source 
2.电压暂降排序
This commit is contained in:
wr
2023-05-26 16:30:37 +08:00
parent ffe71537f7
commit a74500afe8
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
View File

@@ -1090,8 +1090,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
List<DictData> reasonData = reason.getData(); List<DictData> reasonData = reason.getData();
List<DictData> typeData = type.getData(); List<DictData> typeData = type.getData();
HashMap<String, Integer> reasonMap = new HashMap<>(); Map<String, Integer> reasonMap = new LinkedHashMap<>();
HashMap<String, Integer> typeMap = new HashMap<>(); Map<String, Integer> typeMap = new LinkedHashMap<>();
//添加detail //添加detail

14
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java
View File

@@ -131,10 +131,9 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService {
List<String> intervalTime = PubUtils.getIntervalTime(steadyExceedCensusParam.getSearchBeginTime(),steadyExceedCensusParam.getSearchEndTime()); List<String> intervalTime = PubUtils.getIntervalTime(steadyExceedCensusParam.getSearchBeginTime(),steadyExceedCensusParam.getSearchEndTime());
for (String interTime : intervalTime) { for (String interTime : intervalTime) {
String startTime = PublicDateUtil.getFisrtDayOfMonth(Integer.parseInt(interTime.substring(0, 4)), Integer.parseInt(interTime.substring(5))); 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"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date dt = simpleDateFormat.parse(startTime); 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 year = Integer.valueOf(String.format("%tY", dt));
Integer mon = Integer.valueOf(String.format("%tm", dt)); Integer mon = Integer.valueOf(String.format("%tm", dt));
Integer day = Integer.valueOf(String.format("%td", dtDate)); Integer day = Integer.valueOf(String.format("%td", dtDate));
@@ -203,14 +202,9 @@ public class SteadyExceedRateServiceImpl implements SteadyExceedRateService {
List<String> string = new ArrayList<>(); List<String> string = new ArrayList<>();
int beginMouthTime = Integer.parseInt(searchBeginTime.substring(5, 7)); int beginMouthTime = Integer.parseInt(searchBeginTime.substring(5, 7));
int endMouthTime = Integer.parseInt(searchEndTime.substring(5, 7)); int endMouthTime = Integer.parseInt(searchEndTime.substring(5, 7));
int a =0; int size=(endMouthTime - beginMouthTime) + 1;
for (int i =0; i<endMouthTime - beginMouthTime + 1; i++) { for (int i =0; i<size; i++) {
if (i<9) { string.add(searchBeginTime.substring(0, 5)+(beginMouthTime++));
a = beginMouthTime + i;
string.add(searchBeginTime.substring(0, 5)+"0"+a);
} else {
string.add(searchBeginTime.substring(0, 5)+(++a));
}
} }
return string; return string;
} }