新增设备列表接口

gis_service/src/main/java/com/gis/service/DeviceService.java

@@ -10,7 +10,7 @@ import com.gis.domain.dto.DevicePageDto;
  */
 public interface DeviceService  {
 
-    Result getList();
+    Result getList(String userId, String deviceId, String devTypeId);
 
     Result getParam(String devTypeId, String deviceCode);
 

gis_service/src/main/java/com/gis/service/impl/DeviceServiceImpl.java

@@ -8,6 +8,7 @@ import com.gis.domain.dto.DevicePageDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.service.DeviceService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.HashMap;
@@ -27,9 +28,18 @@ public class DeviceServiceImpl  implements DeviceService {
 
 
     @Override
-    public Result getList() {
+    public Result getList(String userId, String deviceId, String devTypeId) {
         String api = "/api/server/v1/devices";
-        return doPost(api, null, null);
+        HashMap<String, String> query = new HashMap<>();
+        query.put("userId", userId);
+        if (StringUtils.isNotBlank(deviceId)) {
+            query.put("deviceId", deviceId);
+        }
+
+        if (StringUtils.isNotBlank(devTypeId)) {
+            query.put("devTypeId", devTypeId);
+        }
+        return doGet(api, query);
     }
 
     @Override

gis_web/src/main/java/com/gis/web/controller/DeviceController.java

@@ -27,11 +27,18 @@ public class DeviceController extends BaseController {
     @Autowired
     DeviceService deviceService;
 
-//    @ApiOperation("设备列表")
-//    @GetMapping("list")
-//    public Result list() {
-//        return deviceService.getList();
-//    }
+    /**
+     * 2021-5-12 通过列表查查询设备状态
+     * @param userId  77547f7af360c5d8e14932866b844d53
+     * @param deviceId 通过这个值，可以获取单条数据的状态
+     * @param devTypeId
+     * @return
+     */
+    @ApiOperation("设备列表")
+    @GetMapping("list/{userId}")
+    public Result list(@PathVariable  String userId, String deviceId, String devTypeId) {
+        return deviceService.getList(userId, deviceId, devTypeId);
+    }
 
 
     @ApiOperation("设备列表分页搜索")