更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -282,19 +282,23 @@ public class SupervisionConfigureController extends AbstractBaseController {
             Date halfHour = DateUtils.dateAddMinutes(null, -30);
             Date twoHour = DateUtils.dateAddHours(null, -2);
             Date fourHour = DateUtils.dateAddHours(null, -4);
+            Date oneHour = DateUtils.dateAddHours(null, -1);
             String startDateStr = DateUtils.convertDateToString(mounthDate, DateUtils.DATE_TIME_PATTERN);
             String half = DateUtils.convertDateToString(halfHour, DateUtils.DATE_TIME_PATTERN);
             String two = DateUtils.convertDateToString(twoHour, DateUtils.DATE_TIME_PATTERN);
             String four = DateUtils.convertDateToString(fourHour, DateUtils.DATE_TIME_PATTERN);
+            String one = DateUtils.convertDateToString(oneHour, DateUtils.DATE_TIME_PATTERN);
             ResponseModel mounthEntity = null;
             ResponseModel halfHourEntity = null;
             ResponseModel twoHourEntity = null;
             ResponseModel fourHourEntity = null;
+            ResponseModel oneHourEntity = null;
             try {
                 mounthEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, pressurePumpStart);
                 halfHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), half, nowStrLong, prefix, suffix, pressurePumpStart);
                 twoHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), two, nowStrLong, prefix, suffix, pressurePumpStart);
                 fourHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), four, nowStrLong, prefix, suffix, pressurePumpStart);
+                oneHourEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), one, nowStrLong, prefix, suffix, pressurePumpStart);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -326,6 +330,13 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 int num = collect.size();
                 item.put("fourHourStartNum", num);
             }
+            if (200 == oneHourEntity.getStatus()) {
+                String json1 = JSON.toJSONString(oneHourEntity.getResult());
+                List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
+                List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey(pressurePumpStart) && t.get(pressurePumpStart).equals("true"))).collect(Collectors.toList());
+                int num = collect.size();
+                item.put("oneHourStartNum", num);
+            }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             long nowDateTime = new Date().getTime();//当前时间戳
             Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id"));

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -192,7 +192,7 @@
             alter table `wl_equipment_detail` add column `delivery_date` datetime DEFAULT NULL COMMENT '投运日期';
         </sql>
     </changeSet>
-    <changeSet author="ltw" id="20220831-ltw2">
+    <changeSet author="ltw" id="20220831-ltw22">
         <preConditions onFail="MARK_RAN">
                <tableExists tableName="wl_form_group_column"/>
         </preConditions>