API修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java

@@ -50,7 +50,7 @@ public class PersonIdentifyAspect {
     public void personIdentity(JoinPoint joinPoint) {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (reginParam != null) {
-            if (reginParam.getPersonIdentity() == null) {
+            if (reginParam.getPersonIdentity() == null || reginParam.getPersonIdentity().getBizOrgCode() == null) {
                 String userId = reginParam.getUserModel().getUserId();
                 if (userId != null) {
                     FeignClientResult responseModel = jcsFeignClient.selectById(userId);

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

@@ -102,10 +102,17 @@ public class ConfigureController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取系统告警信息")
     @GetMapping("/getSystemAlarmInfo")
-    public ResponseModel getSystemAlarmInfo() {
+    public ResponseModel getSystemAlarmInfo(CommonPageable commonPageable) {
+        if (commonPageable.getPageNumber() == 0) {
+            commonPageable.setPageNumber(1);
+        }
         ReginParams reginParams = getSelectedOrgInfo();
         String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
-        return CommonResponseUtil.success(fireFightingSystemMapper.getSystemAlarmInfo(bizOrgCode));
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            return CommonResponseUtil.success(null);
+        }
+        Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
+        return CommonResponseUtil.success(fireFightingSystemMapper.getSystemAlarmInfo(page, bizOrgCode));
     }
 
 
@@ -140,10 +147,17 @@ public class ConfigureController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控页面消防车辆信息")
     @GetMapping("/getFireCarInfoByWL")
-    public ResponseModel getFireCarInfoByWL() {
+    public ResponseModel getFireCarInfoByWL(CommonPageable commonPageable) {
+        if (commonPageable.getPageNumber() == 0) {
+            commonPageable.setPageNumber(1);
+        }
         ReginParams reginParams = getSelectedOrgInfo();
         String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
-        return CommonResponseUtil.success(fireFightingSystemMapper.getFireCarInfoByWL(bizOrgCode));
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            return CommonResponseUtil.success(null);
+        }
+        Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
+        return CommonResponseUtil.success(fireFightingSystemMapper.getFireCarInfoByWL(page, "LSHLZ1bZAJU645Pgl7dMndrF"));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
 import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
@@ -242,7 +243,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      * @param bizOrgCode
      * @return
      */
-    List<Map<String, Object>> getSystemAlarmInfo(@Param("bizOrgCode") String bizOrgCode);
+    Page<Map<String, Object>> getSystemAlarmInfo(Page page, @Param("bizOrgCode") String bizOrgCode);
 
     /**
      * 获取设备告警待确认和未处理信息
@@ -270,7 +271,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      * @param bizOrgCode
      * @return
      */
-    List<Map<String, Object>> getFireCarInfoByWL(@Param("bizOrgCode") String bizOrgCode);
+    Page<Map<String, Object>> getFireCarInfoByWL(Page page, @Param("bizOrgCode") String bizOrgCode);
 
     /**
      * 获取水源信息