Skip to content

A
amos-boot-biz
Commit f05c0fca authored by tianyiming's avatar tianyiming
Browse files
Options

四横八纵消防炮系统告警分析、消防给水系统告警分析修改

parent b5983ae8
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 0 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
View file @ f05c0fca
...@@ -315,6 +315,8 @@ public class EmergencyController extends AbstractBaseController { ...@@ -315,6 +315,8 @@ public class EmergencyController extends AbstractBaseController {
ArrayList<Map<String, Object>> result = new ArrayList<>(); ArrayList<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> maps = iEmergencyService.waterSystemAlarmAnalysis(startDate, endDate, "0", "", systemType); List<Map<String, Object>> maps = iEmergencyService.waterSystemAlarmAnalysis(startDate, endDate, "0", "", systemType);
if ("week".equals(type)) { if ("week".equals(type)) {
String beginMonth = startDate.substring(5,7);
String endMonth = endDate.substring(5,7);
List<Map<String, String>> weeksMapInterval = DateUtils.getWeeksMapInterval(DateUtils.dateToStringMonth(startDate)); List<Map<String, String>> weeksMapInterval = DateUtils.getWeeksMapInterval(DateUtils.dateToStringMonth(startDate));
for (Map<String, String> week : weeksMapInterval) { for (Map<String, String> week : weeksMapInterval) {
Date weekStart = null; Date weekStart = null;
...@@ -363,6 +365,55 @@ public class EmergencyController extends AbstractBaseController { ...@@ -363,6 +365,55 @@ public class EmergencyController extends AbstractBaseController {
} }
result.add(mapData); result.add(mapData);
} }
if(!StringUtils.isEmpty(beginMonth) && !beginMonth.equals(endMonth)){
weeksMapInterval = DateUtils.getWeeksMapInterval(DateUtils.dateToStringMonth(endDate));
for (Map<String, String> weeks : weeksMapInterval) {
Date weekStart1 = null;
Date weekEnd1 = null;
try {
weekStart1 = DateUtils.dateParse(weeks.get("weekStart"), DateUtils.DATE_PATTERN);
weekEnd1 = DateUtils.dateParse(weeks.get("weekEnd"), DateUtils.DATE_PATTERN);
} catch (ParseException e) {
e.printStackTrace();
}
long startTime1 = weekStart1.getTime();
long endTime1 = weekEnd1.getTime();
HashMap<String, Object> mapData1 = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
try {
check = DateUtils.dateParse(String.valueOf(map.get("date")), DateUtils.DATE_PATTERN);
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (!ObjectUtils.isEmpty(mapData1)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData1.get("controlCabinetAlarmNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("controlCabinetAlarmNum")));
BigDecimal now = old.add(add);
mapData1.put("controlCabinetAlarmNum", String.valueOf(now));
BigDecimal firePumpsOld = new BigDecimal(String.valueOf(mapData1.get("firePumpsAlarmNum")));
BigDecimal firePumpsAdd = new BigDecimal(String.valueOf(map.get("firePumpsAlarmNum")));
BigDecimal firePumpsNow = firePumpsOld.add(firePumpsAdd);
mapData1.put("firePumpsAlarmNum", String.valueOf(firePumpsNow));
BigDecimal stabilizedOld = new BigDecimal(String.valueOf(mapData1.get("stabilizedPumpAlarmNum")));
BigDecimal stabilizedAdd = new BigDecimal(String.valueOf(map.get("stabilizedPumpAlarmNum")));
BigDecimal stabilizedNow = stabilizedOld.add(stabilizedAdd);
mapData1.put("stabilizedPumpAlarmNum", String.valueOf(stabilizedNow));
} else {
mapData1.put("name", weeks.get("name"));
mapData1.put("controlCabinetAlarmNum", map.get("controlCabinetAlarmNum"));
mapData1.put("firePumpsAlarmNum", map.get("firePumpsAlarmNum"));
mapData1.put("shielstabilizedPumpAlarmNumdNum", map.get("stabilizedPumpAlarmNum"));
}
}
}
result.add(mapData1);
}
}
} else if ("day".equals(type)) { } else if ("day".equals(type)) {
return maps; return maps;
...@@ -386,6 +437,8 @@ public class EmergencyController extends AbstractBaseController { ...@@ -386,6 +437,8 @@ public class EmergencyController extends AbstractBaseController {
ArrayList<Map<String, Object>> result = new ArrayList<>(); ArrayList<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> maps = iEmergencyService.fireCannonSystemAlarmAnalysis(startDate, endDate, "0", "", systemType); List<Map<String, Object>> maps = iEmergencyService.fireCannonSystemAlarmAnalysis(startDate, endDate, "0", "", systemType);
if ("week".equals(type)) { if ("week".equals(type)) {
String beginMonth = startDate.substring(5,7);
String endMonth = endDate.substring(5,7);
List<Map<String, String>> weeksMapInterval = DateUtils.getWeeksMapInterval(DateUtils.dateToStringMonth(startDate)); List<Map<String, String>> weeksMapInterval = DateUtils.getWeeksMapInterval(DateUtils.dateToStringMonth(startDate));
for (Map<String, String> week : weeksMapInterval) { for (Map<String, String> week : weeksMapInterval) {
Date weekStart = null; Date weekStart = null;
...@@ -440,6 +493,62 @@ public class EmergencyController extends AbstractBaseController { ...@@ -440,6 +493,62 @@ public class EmergencyController extends AbstractBaseController {
} }
result.add(mapData); result.add(mapData);
} }
if(!StringUtils.isEmpty(beginMonth) && !beginMonth.equals(endMonth)){
weeksMapInterval = DateUtils.getWeeksMapInterval(DateUtils.dateToStringMonth(endDate));
for (Map<String, String> weeks : weeksMapInterval) {
Date weekStart1 = null;
Date weekEnd1 = null;
try {
weekStart1 = DateUtils.dateParse(weeks.get("weekStart"), DateUtils.DATE_PATTERN);
weekEnd1 = DateUtils.dateParse(weeks.get("weekEnd"), DateUtils.DATE_PATTERN);
} catch (ParseException e) {
e.printStackTrace();
}
long startTime1 = weekStart1.getTime();
long endTime1 = weekEnd1.getTime();
HashMap<String, Object> mapData1 = new HashMap<>();
for (Map<String, Object> map : maps) {
Date check = null;
try {
check = DateUtils.dateParse(String.valueOf(map.get("date")), DateUtils.DATE_PATTERN);
} catch (ParseException e) {
e.printStackTrace();
}
if (!ObjectUtils.isEmpty(check) && check.getTime() >= startTime1 && check.getTime() <= endTime1) {
if (!ObjectUtils.isEmpty(mapData1)) {
BigDecimal old = new BigDecimal(String.valueOf(mapData1.get("powerLossNum")));
BigDecimal add = new BigDecimal(String.valueOf(map.get("powerLossNum")));
BigDecimal now = old.add(add);
mapData1.put("powerLossNum", String.valueOf(now));
BigDecimal firePumpsOld = new BigDecimal(String.valueOf(mapData1.get("faultNum")));
BigDecimal firePumpsAdd = new BigDecimal(String.valueOf(map.get("faultNum")));
BigDecimal firePumpsNow = firePumpsOld.add(firePumpsAdd);
mapData1.put("faultNum", String.valueOf(firePumpsNow));
BigDecimal stabilizedOld = new BigDecimal(String.valueOf(mapData1.get("fireAlarmNum")));
BigDecimal stabilizedAdd = new BigDecimal(String.valueOf(map.get("fireAlarmNum")));
BigDecimal stabilizedNow = stabilizedOld.add(stabilizedAdd);
mapData1.put("fireAlarmNum", String.valueOf(stabilizedNow));
BigDecimal shieldOld = new BigDecimal(String.valueOf(mapData1.get("shieldNum")));
BigDecimal shieldAdd = new BigDecimal(String.valueOf(map.get("shieldNum")));
BigDecimal shieldNow = shieldOld.add(shieldAdd);
mapData1.put("shieldNum", String.valueOf(shieldNow));
} else {
mapData1.put("name", weeks.get("name"));
mapData1.put("powerLossNum", map.get("powerLossNum"));
mapData1.put("faultNum", map.get("faultNum"));
mapData1.put("fireAlarmNum", map.get("fireAlarmNum"));
mapData1.put("shieldNum", map.get("shieldNum"));
}
}
}
result.add(mapData1);
}
}
} else if ("day".equals(type)) { } else if ("day".equals(type)) {
return maps; return maps;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment