Merge remote-tracking branch 'origin/develop_dl_4.0' into develop_dl_4.0

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

@@ -130,6 +130,21 @@ public class EmergencyController extends AbstractBaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation("炮阀列表")
+	@GetMapping(value = "/fireCannon")
+	public Page<Map<String, Object>> selectFireCannon(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+													   @RequestParam(value = "pageNumber") int pageNumber,
+													   @RequestParam(value = "pageSize") int pageSize,
+													   @RequestParam(value = "code") String code)  {
+		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
+		if (ObjectUtils.isEmpty(bizOrgCode)){
+			ReginParams reginParams = getSelectedOrgInfo();
+			bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+		}
+		return iEmergencyService.selectFireCannon(page, bizOrgCode, code);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation("泡沫罐列表")
 	@GetMapping(value = "/selectFoamTank")
 	public Page<Map<String, Object>> selectFoamTank(@RequestParam(value = "pageNumber") int pageNumber,

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

@@ -124,4 +124,6 @@ public interface EmergencyMapper extends BaseMapper{
     List<Map<String, Object >> getEquipStatistic(@Param("bizOrgCode") String bizOrgCode, @Param("equipCodeKey") String equipCodeKey);
 
     List<Map<String, Object >> getAllTypeEquipStatistic(@Param("bizOrgCode") String bizOrgCode, @Param("list") List<String> list);
+
+    Page<Map<String, Object>> selectFireCannon(Page<Map<String, Object>> page, String bizOrgCode, String code);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -89,4 +89,6 @@ public interface IEmergencyService {
     List<Map<String, Object >> getEquipStatistic(String bizOrgCode, String equipCodeKey);
 
     List<Map<String, Object >> getAllTypeEquipStatistic(String bizOrgCode);
+
+    Page<Map<String, Object>> selectFireCannon(Page<Map<String, Object>> page, String bizOrgCode, String code);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -718,4 +718,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
         List<String> list = EmergencyEquipTypeEnum.getCodeList();
         return emergencyMapper.getAllTypeEquipStatistic(bizOrgCode, list);
     }
+
+    @Override
+    public Page<Map<String, Object>> selectFireCannon(Page<Map<String, Object>> page, String bizOrgCode, String code) {
+        return emergencyMapper.selectFireCannon(page, bizOrgCode, code);
+    }
 }

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

@@ -1807,4 +1807,30 @@
             AND wed.equipment_name is not null
         GROUP BY `code`
     </select>
+    <select id="selectFireCannon" resultType="java.util.Map">
+        SELECT
+        temp.name,
+        temp.alarm,
+        temp.id,
+        temp.code,
+        '--' AS value,
+        IFNULL((SELECT CASE WHEN wesi.`value` = 'true' THEN wesi.equipment_index_name ELSE '关到位' END FROM  wl_equipment_specific_index wesi
+        WHERE wesi.equipment_specific_id = temp.id  AND wesi.equipment_index_key = 'CAFS_GunValve_OpenToPosition' ORDER BY wesi.update_date DESC LIMIT 1),'关到位') AS status
+        FROM
+        (
+        SELECT wes.id,wes.name,wes.code,
+        CASE WHEN (SELECT is_alarm FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key ) = 1
+        AND wes.realtime_iot_index_value = 'true' THEN
+        1 ELSE 0
+        END AS alarm
+        FROM  wl_equipment_specific wes
+        JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
+        WHERE
+        wes.equipment_code LIKE concat( '920302', '%' )
+        <if test="code != null and  code!='' ">
+            AND fire.equipment_id = (SELECT id  FROM f_equipment WHERE `code` = #{code})
+        </if>
+        AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
+        ) temp
+    </select>
 </mapper>