[feat]

1、增加预警同级数据权限
2、开发app首页预警查询

dk-modules/business/src/main/java/org/dromara/business/BusinessApplication.java

@@ -4,6 +4,7 @@ import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
 /**
@@ -12,6 +13,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  */
 @EnableDubbo
 @SpringBootApplication()
+@EnableFeignClients
 public class BusinessApplication {
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(BusinessApplication.class);

dk-modules/business/src/main/java/org/dromara/business/feign/FeignDeviceGroup.java

@@ -0,0 +1,20 @@
+package org.dromara.business.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "gateway",path = "sample")
+public interface FeignDeviceGroup {
+
+
+    @GetMapping("/manage/api/v1/device/group/feign/user")
+    public List<Integer> listDeviceGroup(@RequestParam("userId") Long userId);
+
+
+    @GetMapping("/manage/api/v1/device/group/feign/device")
+    public List<String> listDevice(@RequestParam("userId") Long userId);
+}

dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java

@@ -92,11 +92,23 @@ public class DeviceProController {
     /**
      * 根据人员获取项目组(feign调用接口)
      */
-    @GetMapping("/user")
+    @GetMapping("/feign/user")
     public List<Integer> listDeviceGroup(@RequestParam("userId") Long userId) {
         log.info("----------------------------开始调用feign接口查询项目组----------------------------");
         List<Integer> result = deviceProService.listDeviceGroup(userId);
         log.info("----------------------------调用feign接口查询项目组结束----------------------------");
         return result;
     }
+
+    /**
+     * 根据人员获取当前人员所拥有的机场(feign调用接口)
+     */
+    @GetMapping("/feign/device")
+    public List<String> listDevice(@RequestParam("userId") Long userId) {
+        log.info("----------------------------开始调用feign接口查询项目所属机场----------------------------");
+        List<String> result = deviceProService.listDevice(userId);
+        log.info("----------------------------调用feign接口查询项目组所属机场----------------------------");
+        return result;
+    }
+
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceProService.java

@@ -41,4 +41,6 @@ public interface IDeviceProService {
     Boolean updateDevice(Dict dict);
 
     List<Integer> listDeviceGroup(Long userId);
+
+    List<String> listDevice(Long userId);
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java

@@ -184,6 +184,27 @@ public class DeviceProServiceImpl implements IDeviceProService  {
         return ListUtil.empty();
     }
 
+    @Override
+    public List<String> listDevice(Long userId) {
+        LambdaQueryWrapper<DeviceProUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DeviceProUserEntity::getUserId,userId);
+        List<DeviceProUserEntity> proUserEntityList = deviceProUserMapper.selectList(wrapper);
+        if (ObjectUtil.isNotEmpty(proUserEntityList)){
+            List<Integer> proIdList = proUserEntityList.stream().map(DeviceProUserEntity::getDeviceProId).distinct().toList();
+            LambdaQueryWrapper<DeviceProEntity> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(DeviceProEntity::getId, proIdList);
+            List<Integer> groupIdList = deviceProMapper.selectList(queryWrapper).stream().map(DeviceProEntity::getId).distinct().toList();
+
+            if (ObjectUtil.isEmpty(groupIdList)){
+                return ListUtil.empty();
+            }
+
+            return deviceMapper.selectList(new LambdaQueryWrapper<DeviceEntity>().in(DeviceEntity::getProId, groupIdList)).stream().map(DeviceEntity::getDeviceSn).distinct().toList();
+        }
+
+        return ListUtil.empty();
+    }
+
     @Override
     public Boolean saveAndUpdate(DeviceProEntity entity) {
         boolean flag = true;