Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-normal-push

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/mqtt/alarm/Alarm.java

@@ -70,7 +70,7 @@ public class Alarm implements MqttStrategy {
             baseAlarm.setAlarmAddress(alarams.get(0).get("deviceName").toString());
         }else if (alarams.get(0).get("deviceType").equals("3")||alarams.get(0).get("deviceType").equals("137")){
             baseAlarm.setAlarmContent(dp.get(0).get("property").toString());
-            baseAlarm.setAlarmGrade(2);
+            baseAlarm.setAlarmGrade(1);
             baseAlarm.setAlarmAddress(alarams.get(0).get("deviceName").toString());
             LambdaQueryWrapper<DmpDeviceLinkage> queryWrapper5 = Wrappers.lambdaQuery();
             queryWrapper5.eq(DmpDeviceLinkage::getDeviceId,map.get("devId").toString());

service-eg/service-eg-biz/src/main/java/com/usky/eg/controller/web/EgDeviceController.java

@@ -32,6 +32,11 @@ public class EgDeviceController {
         return ApiResult.success(egDeviceService.page(requestVO));
     }
 
+    @PostMapping("wePage")
+    public ApiResult<CommonPage<EgDevice>> wePage(@RequestBody EgDeviceRequestVO requestVO){
+        return ApiResult.success(egDeviceService.wePage(requestVO));
+    }
+
     /**
      * 新增
      * @param egDevice

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/EgDeviceService.java

@@ -19,6 +19,8 @@ import java.util.Map;
 public interface EgDeviceService extends CrudService<EgDevice> {
     CommonPage<EgDevice> page(EgDeviceRequestVO requestVO);
 
+    CommonPage<EgDevice> wePage(EgDeviceRequestVO requestVO);
+
     void add(EgDevice egDevice);
 
     void update(EgDevice egDevice);

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/impl/EgDeviceServiceImpl.java

@@ -90,6 +90,33 @@ public class EgDeviceServiceImpl extends AbstractCrudService<EgDeviceMapper, EgD
         return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getSize(),requestVO.getCurrent());
     }
 
+    @Override
+    public CommonPage<EgDevice> wePage(EgDeviceRequestVO requestVO){
+        long userId = SecurityUtils.getUserId();
+        //人员设备权限校验，校验通过，可以下发命令控制设备
+        Integer fid = baseMapper.getMeetingFaceData(userId);
+        if(fid == null){
+            throw new BusinessException("人脸卡号信息未注册");
+        }
+        Integer[] deviceFid = baseMapper.getMeetingFaceDeviceList(fid);
+        if(deviceFid.length == 0){
+            throw new BusinessException("人员未绑定设备，请检查");
+        }
+
+        IPage<EgDevice> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
+        LambdaQueryWrapper<EgDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(requestVO.getDeviceName()),EgDevice::getDeviceName,requestVO.getDeviceName())
+                .like(StringUtils.isNotBlank(requestVO.getInstallAddress()),EgDevice::getInstallAddress,requestVO.getInstallAddress())
+                .eq(null != requestVO.getServiceStatus(),EgDevice::getServiceStatus,requestVO.getServiceStatus())
+                .eq(null != requestVO.getId(),EgDevice::getId,requestVO.getId())
+                .in(EgDevice::getId,deviceFid)
+                .eq(EgDevice::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(EgDevice::getId);
+        page = this.page(page,queryWrapper);
+
+        return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getSize(),requestVO.getCurrent());
+    }
+
     @Override
     public void add(EgDevice egDevice){
         if(checkNameUnique(egDevice)){