近七日启停

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

@@ -188,6 +188,10 @@ public class ConfigureController extends AbstractBaseController {
         if (!CollectionUtils.isEmpty(fireCarInfoByWL.getRecords())) {
             List<Map<String, Object>> records = fireCarInfoByWL.getRecords();
             records.forEach(item -> {
+                String carId = item.get("id").toString();
+                Map<String, Object> fireCaStartBySeven = fireFightingSystemMapper.getFireCaStartBySeven(carId);
+                Object count = fireCaStartBySeven.get("count");
+                item.put("count",count.toString());
                 if (item.containsKey("carStateDate") && !ObjectUtils.isEmpty(item.get("carStateDate"))) {
                     try {
                         Date carStateDate = DateUtils.dateParse(item.get("carStateDate").toString(), "yyyy-MM-dd'T'HH:mm:ss");

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -300,6 +300,14 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     Page<Map<String, Object>> getFireCarInfoByWL(Page page, @Param("bizOrgCode") String bizOrgCode);
 
     /**
+     * 物联监控页面消防车辆信息
+     *
+     * @param carId
+     * @return
+     */
+    Map<String, Object> getFireCaStartBySeven(@Param("carId") String carId);
+
+    /**
      * 获取水源信息
      *
      * @param bizOrgCode

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -4356,4 +4356,9 @@
         temp.notReturnd DESC
 
     </select>
+    <select id="getFireCaStartBySeven" resultType="java.util.Map">
+        select count(1) as count from wl_car_property wcp  where
+            wcp.create_date BETWEEN DATE_SUB(NOW(),INTERVAL 7 DAY)  and  now()
+            and equipment_index_key = 'FireCar_Start' and value = 'true' and car_id = #{carId}
+    </select>
 </mapper>