接口更新

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

 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);
+	}
 
 }

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

 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);
 
 
 }

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

 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);
 }

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

 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);
     }
 }