更新设备自检接口

service-iot/service-iot-biz/pom.xml

@@ -75,6 +75,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-alarm-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -1,21 +1,15 @@
 package com.usky.iot.controller.web;
 
 
+import com.usky.alarm.RemoteWebSocketService;
 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.*;
 
-import org.springframework.stereotype.Controller;
 
 /**
  * <p>
@@ -31,6 +25,9 @@ public class BaseAppInfoController {
     @Autowired
     private BaseAppInfoService baseAppInfoService;
 
+    @Autowired
+    private RemoteWebSocketService remoteWebSocketService;
+
     /**
      * 新增
      * @param baseAppInfo
@@ -47,12 +44,22 @@ public class BaseAppInfoController {
      * @param appInfoRequest
      * @return
      */
-    @Log(title = "设备列表分页", businessType = BusinessType.OTHER)
     @PostMapping("/page")
     public ApiResult<CommonPage<BaseAppInfo>> page(@RequestBody AppInfoRequest appInfoRequest)
     {
         return ApiResult.success(baseAppInfoService.page(appInfoRequest));
     }
 
+    /**
+     * 自检
+     * @param baseAppInfo
+     * @return
+     */
+    @PostMapping("/selfCheck")
+    public ApiResult<Void> selfCheck(@RequestBody String baseAppInfo){
+        remoteWebSocketService.selfCheck(baseAppInfo);
+        return ApiResult.success();
+    }
+
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseAppInfo.java

@@ -102,5 +102,10 @@ public class BaseAppInfo implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 设备状态
+     */
+    private Integer deviceStatus;
+
 
 }

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

@@ -4,6 +4,7 @@ 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.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.agbox.RemotePatrolAgBoxService;
@@ -105,8 +106,8 @@ public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMappe
     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");
+        queryWrapper.eq(StringUtils.isNotBlank(appInfoRequest.getDeviceId()),"device_id",appInfoRequest.getDeviceId())
+                .inSql("id","SELECT MAX(id) AS id FROM base_app_info GROUP BY device_id");
         page = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAppInfoMapper.xml

@@ -20,6 +20,7 @@
         <result column="create_by" property="createBy" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="device_status" property="deviceStatus" />
     </resultMap>
 
 </mapper>