修改车辆近七日启停查询bug

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

@@ -188,10 +188,31 @@ 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());
+                String prefix = null;
+                String suffix = null;
+                String iotCode = item.get("iot_code").toString();
+                if (iotCode.length() > 8) {
+                    prefix = iotCode.substring(0, 8);
+                    suffix = iotCode.substring(8);
+                } else {
+                    throw new BadRequest("装备物联编码错误，请确认！");
+                }
+                String nowStrLong = DateUtils.getNowStrLong();
+                Date sevenDay = DateUtils.dateAddDays(null, -7);
+                String seven = DateUtils.convertDateToString(sevenDay, DateUtils.DATE_TIME_PATTERN);
+                ResponseModel sevenEntity = null;
+                try {
+                    sevenEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), seven, nowStrLong, prefix, suffix, "FireCar_Start");
+                   } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                if (200 == sevenEntity.getStatus()) {
+                    String json1 = JSON.toJSONString(sevenEntity.getResult());
+                    List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
+                    List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FireCar_Start") && t.get("FireCar_Start").equals("true"))).collect(Collectors.toList());
+                    int num = collect.size();
+                    item.put("count", num);
+                }
                 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,13 +300,7 @@ 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);
+
 
     /**
      * 获取水源信息

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

@@ -2320,6 +2320,7 @@
         (
         SELECT
         `wc`.`id` AS `id`,
+        `wc`.`iot_code` AS `iot_code`,
         `wc`.`name` AS `name`,
         IFNULL( max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_WaterCapacity' ) THEN `wcp`.`value` END ), 0 ) AS `waterCapacity`,
         IFNULL( max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_FoamCapacity' ) THEN `wcp`.`value` END ), 0 ) AS `foamCapacity`,
@@ -4531,11 +4532,6 @@
         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>
 
     <select id="getWaterInfoBySuper" resultType="java.util.Map">
         select * from (