物联监控概览大屏页面部分API

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

@@ -148,4 +148,15 @@ public class ConfigureController extends AbstractBaseController {
         String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
         return CommonResponseUtil.success(fireFightingSystemMapper.getFireCarInfo(bizOrgCode));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "物联监控页面消防车辆信息")
+    @GetMapping("/getFireCarInfoByWL")
+    public ResponseModel getFireCarInfoByWL() {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
+        return CommonResponseUtil.success(fireFightingSystemMapper.getFireCarInfoByWL(bizOrgCode));
+    }
+
+
 }

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

@@ -237,11 +237,38 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     List<Map<String, Object>> listByBizOrgCode(@Param("bizOrgCode") String bizOrgCode);
 
+    /**
+     * 获取系统告警信息
+     * @param bizOrgCode
+     * @return
+     */
     List<Map<String, Object>> getSystemAlarmInfo(@Param("bizOrgCode") String bizOrgCode);
 
+    /**
+     * 获取设备告警待确认和未处理信息
+     * @param bizOrgCode
+     * @return
+     */
     List<Map<String, Object>> getEquipAlarmInfoNum(@Param("bizOrgCode") String bizOrgCode);
 
+    /**
+     * 获取消防力量信息（队伍值班等）
+     * @param bizOrgCode
+     * @return
+     */
     List<Map<String, Object>> getFireTeamInfo(@Param("bizOrgCode") String bizOrgCode);
 
+    /**
+     * 消防车辆信息
+     * @param bizOrgCode
+     * @return
+     */
     List<Map<String, Object>> getFireCarInfo(@Param("bizOrgCode") String bizOrgCode);
+
+    /**
+     * 物联监控页面消防车辆信息
+     * @param bizOrgCode
+     * @return
+     */
+    List<Map<String, Object>> getFireCarInfoByWL(@Param("bizOrgCode") String bizOrgCode);
 }

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

@@ -2373,7 +2373,7 @@
                  '异常',
                  '正常'
                 ) AS `stateDesc`,
-            ec.image
+            IFNULL(ec.image, "") AS image
         FROM
             `f_fire_fighting_system` `fs`
                 LEFT JOIN `wl_equipment_specific` `wes` ON (
@@ -2478,4 +2478,39 @@
         </where>
         ) a
     </select>
+
+    <select id="getFireCarInfoByWL" resultType="java.util.Map">
+        SELECT
+            `wc`.`id` AS `id`,
+            `wc`.`name` AS `name`,
+            max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_WaterCapacity' ) THEN `wcp`.`value` END ) AS `waterCapacity`,
+            max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_FoamCapacity' ) THEN `wcp`.`value` END ) AS `foamCapacity`,
+            max(
+                    CASE
+
+                        WHEN ( `wcp`.`equipment_index_key` = 'FireCar_Start' AND `wcp`.`value` = 'true' ) THEN
+                            '启动'
+                        WHEN ( `wcp`.`equipment_index_key` = 'FireCar_Start' AND `wcp`.`value` = 'false' ) THEN
+                            '熄火'
+                        END
+                ) AS `carState`,
+            max(
+                    CASE
+
+                        WHEN ( `wcp`.`equipment_index_key` = 'FireCar_Start' AND `wcp`.`value` = 'true' ) THEN
+                            `wcp`.`update_date`
+                        WHEN ( `wcp`.`equipment_index_key` = 'FireCar_Start' AND `wcp`.`value` = 'false' ) THEN
+                            `wcp`.`update_date`
+                        END
+                ) AS `carStateDate`
+        FROM
+            `wl_car` `wc`
+                LEFT JOIN `wl_car_property` `wcp` ON `wcp`.`car_id` = `wc`.`id`
+        <where>
+            1=1
+            <if test="bizOrgCode!=null and bizOrgCode!=''">
+                AND wc.biz_org_code = #{bizOrgCode,jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
 </mapper>