java/zhihuishenqu.git

			@@ -113,12 +113,12 @@
			<select id="getAlarmBaseData"
			resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo">
			SELECT
			(SELECT COUNT(id) FROM com_property_equipment WHERE community_id = #{communityId} AND `type` = 1) AS abnormalAlarmTotal,
			(SELECT COUNT(id) FROM com_property_equipment WHERE community_id = #{communityId} AND `type` = 2) AS oneKeyAlarmTotal,
			(SELECT COUNT(id) FROM com_property_equipment WHERE community_id = #{communityId} AND `type` = 2) AS abnormalAlarmTotal,
			(SELECT COUNT(id) FROM com_property_equipment WHERE community_id = #{communityId} AND `type` = 1) AS oneKeyAlarmTotal,
			(SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
			WHERE t2.community_id = #{communityId} AND t2.`type` = 1) AS abnormalTotal,
			WHERE t2.community_id = #{communityId} AND t2.`type` = 2) AS abnormalTotal,
			(SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
			WHERE t2.community_id = #{communityId} AND t2.`type` = 2) AS oneKeyTotal,
			WHERE t2.community_id = #{communityId} AND t2.`type` = 1) AS oneKeyTotal,
			(SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
			WHERE t2.community_id = #{communityId} AND t1.`status` = 0 AND t1.`type` = 2) AS pendingAbnormalTotal,
			(SELECT COUNT(t1.id) FROM com_property_alarm t1 LEFT JOIN com_property_equipment t2 ON t1.serial_no = t2.serial_no
			@@ -216,10 +216,7 @@
			longitude,
			`type`,
			`position`,
			CASE `type`
			WHEN 1 THEN 2
			WHEN 2 THEN 1
			END AS equipmentStatus
			`type` AS equipmentStatus
			FROM com_property_equipment
			WHERE serial_no IN(
			SELECT DISTINCT(t1.serial_no)

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -62,7 +62,7 @@
			/**
			* 设备类型
			*/
			@ApiModelProperty(value = "设备类型 1异常报警 2一键报警 ")
			@ApiModelProperty(value = "设备类型 1一键报警 2异常报警 ")
			private Integer type;

			@ApiModelProperty(value = "手机号")