Merge branch 'han' of uskycloud/usky-modules into server-165

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/websocket/WebSocketPatrol.java

@@ -0,0 +1,2 @@
+package com.usky.alarm.service.config.websocket;public class WebSocketPatrol {
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseAppInfoController.java

@@ -2,17 +2,20 @@ package com.usky.iot.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.iot.domain.BaseAlarmType;
 import com.usky.iot.domain.BaseAppInfo;
+import com.usky.iot.domain.BaseGgpFacility;
 import com.usky.iot.service.BaseAlarmTypeService;
 import com.usky.iot.service.BaseAppInfoService;
+import com.usky.iot.service.vo.AppInfoRequest;
+import com.usky.iot.service.vo.BaseGgpFacilityRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -39,5 +42,17 @@ public class BaseAppInfoController {
         return ApiResult.success();
     }
 
+    /**
+     * 分页
+     * @param appInfoRequest
+     * @return
+     */
+    @Log(title = "设备列表分页", businessType = BusinessType.OTHER)
+    @PostMapping("/page")
+    public ApiResult<CommonPage<BaseAppInfo>> page(@RequestBody AppInfoRequest appInfoRequest)
+    {
+        return ApiResult.success(baseAppInfoService.page(appInfoRequest));
+    }
+
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseAppInfoService.java

@@ -1,8 +1,12 @@
 package com.usky.iot.service;
 
+import com.usky.common.core.bean.CommonPage;
 import com.usky.iot.domain.BaseAlarmType;
 import com.usky.iot.domain.BaseAppInfo;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.iot.domain.BaseGgpFacility;
+import com.usky.iot.service.vo.AppInfoRequest;
+import com.usky.iot.service.vo.BaseGgpFacilityRequest;
 
 /**
  * <p>
@@ -19,4 +23,6 @@ public interface BaseAppInfoService extends CrudService<BaseAppInfo> {
      * @return
      */
     void add(BaseAppInfo baseAppInfo);
+
+    CommonPage<BaseAppInfo> page(AppInfoRequest appInfoRequest);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAppInfoServiceImpl.java

@@ -1,13 +1,22 @@
 package com.usky.iot.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.agbox.RemotePatrolAgBoxService;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.BaseAppInfo;
+import com.usky.iot.domain.BaseGgpFacility;
 import com.usky.iot.mapper.BaseAppInfoMapper;
 import com.usky.iot.service.BaseAppInfoService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.config.rabbitmq.RabbitMQConfig;
+import com.usky.iot.service.vo.AppInfoRequest;
+import com.usky.iot.service.vo.BaseGgpFacilityRequest;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -91,4 +100,14 @@ public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMappe
 //            JSONObject a = remotePatrolAgboxService.updateHeart(jsonObj.toJSONString());
 //        }
     }
+
+    @Override
+    public CommonPage<BaseAppInfo> page(AppInfoRequest appInfoRequest) {
+        IPage<BaseAppInfo> page = new Page<>(appInfoRequest.getCurrent(), appInfoRequest.getSize());
+        QueryWrapper<BaseAppInfo> queryWrapper = Wrappers.query();
+        queryWrapper.select("id","device_id as deviceId","user_name as userName","device_model as deviceModel")
+                .in("id","215");
+        page = this.page(page,queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/AppInfoRequest.java

@@ -3,7 +3,7 @@ package com.usky.iot.service.vo;
 import lombok.Data;
 
 @Data
-public class BaseGgpFacilityRequest {
+public class AppInfoRequest {
 
     /**
      * 页数
@@ -15,17 +15,9 @@ public class BaseGgpFacilityRequest {
     private Integer size;
 
     /**
-     * 设施名称
+     * 设备ID
      */
-    private String facilityName;
-    /**
-     * 设施编号
-     */
-    private String facilityNum;
-    /**
-     * 设施类型
-     */
-    private Integer facilityType;
+    private String deviceId;
     /**
      * id
      */