更新 file-service 中 cam 相关接口

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/CamController.java

@@ -53,21 +53,16 @@ public class CamController {
         return WebResult.result(result);
     }
 
-    @Operation(summary = "摄像头 kv 列表", description = "N")
-    @GetMapping("/kv")
-    public String getCamKeyValues() {
-        List<SelectOption> kvs = camService.getCamKeyValues();
+    @Operation(summary = "摄像头列表", description = "N")
+    @GetMapping("/list")
+    public String getCamList() {
+        List<CamDevice> kvs = camService.getCamList();
         return WebResult.success(kvs);
     }
 
     @Operation(summary = "摄像头详情", description = "N")
     @GetMapping("/detail")
     public String getCamDetail(@Validated CamSearch camSearch) {
-        List<SelectOption> kvs = camService.getCamKeyValues();
-        if (kvs.isEmpty()) {
-            return WebResult.failWithMsg("No Cam");
-        }
-
         String currentDayStr = LocalDate.now().toString();
         String yearMonthDay = camSearch.getYearMonthDay();
         if (yearMonthDay != null) {
@@ -75,10 +70,6 @@ public class CamController {
         }
 
         Long camId = camSearch.getCamId();
-        if (camId == null) {
-            camId = Long.parseLong(kvs.get(0).getValue());
-        }
-
         CamDevice camDevice = camService.getCamDevice(camId);
         List<CamRecordInfo> dayRecords = camRecordService.getCamRecordByDay(camId, currentDayStr);
         CamDetail camDetail = new CamDetail(camDevice, yearMonthDay, dayRecords);

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/CamService.java

@@ -14,7 +14,6 @@ import cn.reghao.tnb.file.app.zdisk.model.dto.CamDeviceDto;
 import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
 import cn.reghao.tnb.file.app.zdisk.model.po.UserActivity;
 import cn.reghao.tnb.file.app.zdisk.model.query.CamDeviceQuery;
-import cn.reghao.tnb.common.db.SelectOption;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +21,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -54,7 +52,7 @@ public class CamService {
         camDeviceMapper.save(camDevice);
     }
 
-    public List<SelectOption> getCamKeyValues() {
+    public List<CamDevice> getCamList() {
         long loginUser = UserContext.getUserId();
         CamDeviceQuery camDeviceQuery = new CamDeviceQuery.Builder()
                 .addBy(loginUser)
@@ -68,12 +66,7 @@ public class CamService {
             sharedCamDevices.forEach(this::setSharedCamName);
             camDeviceList.addAll(sharedCamDevices);
         }
-
-        return camDeviceList.stream().map(camDevice -> {
-            long camId = camDevice.getCamId();
-            String camName = camDevice.getCamName();
-            return new SelectOption(camName, camId+"");
-        }).collect(Collectors.toList());
+        return camDeviceList;
     }
 
     public CamDevice getCamDevice(long camId) {