Commit 0d88ddc8 authored by lisong's avatar lisong

接口更新

parent 83d81452
package com.yeejoin.equipmanage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
import com.yeejoin.equipmanage.service.IAreaService;
......@@ -61,35 +62,71 @@ public class EmergencyController extends AbstractBaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("应急物资-详情")
@GetMapping(value = "/emergencyMaterialsDetails")
public List<Map<String, Object>> emergencyMaterialsDetails(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ) {
public Page<Map<String, Object>> emergencyMaterialsDetails(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.emergencyMaterialsDetails(bizOrgCode);
return iEmergencyService.emergencyMaterialsDetails(page, bizOrgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("消防炮列表")
@GetMapping(value = "/fireMonitor")
public List<Map<String, Object>> selectFireMonitor(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ) {
public Page<Map<String, Object>> selectFireMonitor(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.selectFireMonitor(bizOrgCode);
return iEmergencyService.selectFireMonitor(page, bizOrgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("消防炮列表")
@ApiOperation("泡沫罐列表")
@GetMapping(value = "/selectFoamTank")
public List<Map<String, Object>> selectFoamTank(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ) {
public Page<Map<String, Object>> selectFoamTank(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize
) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.selectFoamTank(bizOrgCode);
return iEmergencyService.selectFoamTank(page, bizOrgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("排油系统列表")
@GetMapping(value = "/selectOilDrainage")
public Page<Map<String, Object>> selectOilDrainage(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.selectOilDrainage(page, bizOrgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("压力流量")
@GetMapping(value = "/selectPressureFlow")
public Page<Map<String, Object>> selectPressureFlow(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode ,
@RequestParam(value = "pageNumber") int pageNumber,
@RequestParam(value = "pageSize") int pageSize) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
if (ObjectUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
return iEmergencyService.selectPressureFlow(page, bizOrgCode);
}
}
package com.yeejoin.equipmanage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.equipmanage.common.entity.CarInfo;
import feign.Param;
......@@ -11,7 +12,7 @@ import java.util.Map;
* Mapper 接口
*
*/
public interface EmergencyMapper {
public interface EmergencyMapper extends BaseMapper{
/**
* 应急物资列表
......@@ -25,21 +26,36 @@ public interface EmergencyMapper {
* @param bizOrgCode
* @return
*/
List<Map<String, Object>> selectEmergencyMaterialsDetails(@Param("bizOrgCode") String bizOrgCode);
Page<Map<String, Object>> selectEmergencyMaterialsDetails(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode);
/**
* 消防炮列表
* @param bizOrgCode
* @return
*/
List<Map<String, Object>> selectFireMonitor(@Param("bizOrgCode") String bizOrgCode);
Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode);
/**
* 泡沫罐
* @param bizOrgCode
* @return
*/
List<Map<String, Object>> selectFoamTank(@Param("bizOrgCode") String bizOrgCode);
Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page , @Param("bizOrgCode") String bizOrgCode);
/**
* 排油系统
* @param bizOrgCode
* @return
*/
Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page , @Param("bizOrgCode") String bizOrgCode);
/**
* 压力流量
* @param page
* @param bizOrgCode
* @return
*/
Page<Map<String, Object>> selectPressureFlow(Page<Map<String, Object>> page , @Param("bizOrgCode") String bizOrgCode);
}
package com.yeejoin.equipmanage.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
......@@ -20,9 +21,13 @@ public interface IEmergencyService {
Map<String, Object> emergencyMaterials(String bizOrgCode);
List<Map<String, Object>> emergencyMaterialsDetails(String bizOrgCode);
Page<Map<String, Object>> emergencyMaterialsDetails(Page<Map<String, Object>> page, String bizOrgCode);
List<Map<String, Object>> selectFireMonitor(String bizOrgCode);
Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode);
List<Map<String, Object>> selectFoamTank(String bizOrgCode);
Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page, String bizOrgCode);
Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode);
Page<Map<String, Object>> selectPressureFlow(Page<Map<String, Object>> page, String bizOrgCode);
}
package com.yeejoin.equipmanage.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
import com.yeejoin.equipmanage.mapper.EmergencyMapper;
......@@ -33,17 +34,27 @@ public class EmergencyServiceImpl implements IEmergencyService {
}
@Override
public List<Map<String, Object>> emergencyMaterialsDetails(String bizOrgCode) {
return emergencyMapper.selectEmergencyMaterialsDetails(bizOrgCode);
public Page<Map<String, Object>> emergencyMaterialsDetails(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectEmergencyMaterialsDetails(page , bizOrgCode);
}
@Override
public List<Map<String, Object>> selectFireMonitor(String bizOrgCode) {
return emergencyMapper.selectFireMonitor(bizOrgCode);
public Page<Map<String, Object>> selectFireMonitor(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectFireMonitor(page, bizOrgCode);
}
@Override
public List<Map<String, Object>> selectFoamTank(String bizOrgCode) {
return emergencyMapper.selectFoamTank(bizOrgCode);
public Page<Map<String, Object>> selectFoamTank(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectFoamTank(page, bizOrgCode);
}
@Override
public Page<Map<String, Object>> selectOilDrainage(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectOilDrainage(page, bizOrgCode);
}
@Override
public Page<Map<String, Object>> selectPressureFlow(Page<Map<String, Object>> page, String bizOrgCode) {
return emergencyMapper.selectPressureFlow(page, bizOrgCode);
}
}
......@@ -76,17 +76,16 @@
SELECT
temp.name,
temp.nowLevel,
temp.volume,
CASE
WHEN ( temp.nowLevel = '--' ) THEN
'--'
WHEN ( temp.nowLevel &lt; temp.minLevel ) THEN
'液位低'
WHEN ( temp.nowLevel > temp.maxLevel ) THEN
'液位高' ELSE '正常'
END AS STATUS,
END AS status,
CASE
WHEN ( temp.nowLevel = '--' ) THEN
'--' ELSE format(
IF
......@@ -108,8 +107,9 @@
wes.id,
wes.name,
IFNULL( ( SELECT value FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'CAFS_FoamTank_FoamTankLevel' ), '--' ) AS nowLevel,
( SELECT IFNULL( field_value, 0 ) FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxLevel' ) AS maxLevel,
( SELECT IFNULL( field_value, 0 ) FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minLevel' ) AS minLevel
IFNULL(( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxLevel' ) , 0 )AS maxLevel,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minLevel' ), 0 ) AS minLevel,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'volume' ), 0 ) AS volume
FROM
wl_equipment_specific wes
JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
......@@ -120,6 +120,197 @@
</select>
<select id="selectOilDrainage" resultType="java.util.Map">
SELECT
wes.id,
wes.name,
IFNULL(
(
SELECT
wesi.equipment_index_name
FROM
wl_equipment_specific_index wesi
WHERE
wesi.equipment_specific_id = wes.id
AND wesi.is_alarm = 1 AND wesi.`value` is not NULL
ORDER BY
wesi.update_date DESC
LIMIT 1
),
'--'
) AS status,
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( '921003', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' ) UNION
(
SELECT
wes.id,
wes.name,
IFNULL(
(
SELECT
wesi.equipment_index_name
FROM
wl_equipment_specific_index wesi
WHERE
wesi.equipment_specific_id = wes.id
AND wesi.is_alarm = 1 AND wesi.`value` is not NULL
ORDER BY
wesi.update_date DESC
LIMIT 1
),
'--'
) AS status,
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( '921002', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) UNION
(
SELECT
wes.id,
wes.name,
IFNULL(
(
SELECT
wesi.equipment_index_name
FROM
wl_equipment_specific_index wesi
WHERE
wesi.equipment_specific_id = wes.id
AND wesi.is_alarm = 1 AND wesi.`value` is not NULL
ORDER BY
wesi.update_date DESC
LIMIT 1
),
'--'
) AS status,
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( '921004', '%' )AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) UNION
(
SELECT
wes.id,
wes.name,
IFNULL(
(
SELECT
wesi.equipment_index_name
FROM
wl_equipment_specific_index wesi
WHERE
wesi.equipment_specific_id = wes.id
AND wesi.is_alarm = 1 AND wesi.`value` is not NULL
ORDER BY
wesi.update_date DESC
LIMIT 1
),
'--'
) AS status,
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( '921005', '%' )AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
)
</select>
<select id="selectPressureFlow" resultType="java.util.Map">
SELECT
temp.id,
temp.name,
temp.nowPressure,
temp.area,
CASE
WHEN temp.nowPressure = '--' THEN
'--'
WHEN temp.nowPressure > temp.maxPressure THEN
'压力高'
WHEN temp.nowPressure &lt; temp.minPressure THEN
'压力低' ELSE '正常'
END AS status,
1 AS type
FROM
(
SELECT
wes.id,
wes.name,
concat_ws( '-', ws.full_name, ed.area ) area,
IFNULL( ( SELECT VALUE FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_PipePressureDetector_PipePressure' ), '--' ) AS nowPressure,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxPressure' ), 0 ) AS maxPressure,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minPressure' ), 0 ) AS minPressure
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail ed ON wes.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = wes.warehouse_structure_id
LEFT JOIN wl_equipment_specific_index ei ON wes.id = ei.equipment_specific_id
LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = wes.id
WHERE
wes.equipment_code LIKE concat( '92011000', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
UNION
SELECT
temp.id,
temp.name,
temp.nowFlow,
temp.area,
CASE
WHEN temp.nowFlow = '--' THEN
'--'
WHEN temp.nowFlow > temp.maxFlow THEN
'流量高'
WHEN temp.nowFlow &lt; temp.minFlow THEN
'流量低' ELSE '正常'
END AS status,
2 AS type
FROM
(
SELECT
wes.id,
wes.NAME,
concat_ws( '-', ws.full_name, ed.area ) area,
IFNULL( ( SELECT VALUE FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_FirePoolDevice_WaterFlow' ), '--' ) AS nowFlow,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxFlow' ), 0 ) AS maxFlow,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minFlow' ), 0 ) AS minFlow
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail ed ON wes.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = wes.warehouse_structure_id
LEFT JOIN wl_equipment_specific_index ei ON wes.id = ei.equipment_specific_id
LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = wes.id
WHERE
wes.equipment_code LIKE concat( '92010700', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment