统一使用 cn.reghao.tnb.common.db.SelectOption 来表示前端 el-select 标签中 el-option 的值

common/src/main/java/cn/reghao/tnb/common/db/SelectOption.java

@@ -13,5 +13,5 @@ import lombok.Getter;
 @Getter
 public class SelectOption {
     private String label;
-    private long value;
+    private String value;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/controller/CamController.java

@@ -9,7 +9,7 @@ import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
 import cn.reghao.tnb.content.app.disk.model.vo.*;
 import cn.reghao.tnb.content.app.disk.service.CamRecordService;
 import cn.reghao.tnb.content.app.disk.service.CamService;
-import cn.reghao.tnb.content.app.geo.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/CamService.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.disk.model.dto.CamDeviceDto;
 import cn.reghao.tnb.content.app.disk.model.po.CamDevice;
 import cn.reghao.tnb.content.app.disk.model.po.UserActivity;
 import cn.reghao.tnb.content.app.disk.model.query.CamDeviceQuery;
-import cn.reghao.tnb.content.app.geo.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.util.IdService;
 import cn.reghao.tnb.content.app.util.RandomUtil;
 import org.apache.dubbo.config.annotation.DubboReference;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskAlbumService.java

@@ -235,7 +235,7 @@ public class DiskAlbumService {
         return diskAlbumMapper.findByCreateBy(loginUser).stream().map(diskAlbum -> {
             long albumId = diskAlbum.getAlbumId();
             String albumName = diskAlbum.getAlbumName();
-            return new SelectOption(albumName, albumId);
+            return new SelectOption(albumName, albumId+"");
         }).collect(Collectors.toList());
     }
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/controller/ChartMapController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.geo.controller;
 
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.content.app.geo.model.vo.ChartMap;
-import cn.reghao.tnb.content.app.geo.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.geo.service.ChartMapService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/model/vo/SelectOption.java

@@ -1,17 +0,0 @@
-package cn.reghao.tnb.content.app.geo.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author reghao
- * @date 2025-08-19 14:03:06
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-public class SelectOption {
-    private String label;
-    private String value;
-}

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/service/ChartMapService.java

@@ -2,10 +2,13 @@ package cn.reghao.tnb.content.app.geo.service;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.text.TextFile;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.geo.db.mapper.CameraPhotoMapper;
 import cn.reghao.tnb.content.app.geo.db.mapper.GeoChinaMapper;
 import cn.reghao.tnb.content.app.geo.model.po.GeoJson;
-import cn.reghao.tnb.content.app.geo.model.vo.*;
+import cn.reghao.tnb.content.app.geo.model.vo.AreaCount;
+import cn.reghao.tnb.content.app.geo.model.vo.ChartMap;
+import cn.reghao.tnb.content.app.geo.model.vo.ChartMapData;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/service/PhotoMapService.java

@@ -148,7 +148,7 @@ public class PhotoMapService {
         return Arrays.stream(GeoItem.values()).map(geoItem -> {
             int id = geoItem.getValue();
             String name = geoItem.getName();
-            return new SelectOption(name, id);
+            return new SelectOption(name, id+"");
         }).collect(Collectors.toList());
     }
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/AdminVodController.java

@@ -10,7 +10,7 @@ import cn.reghao.tnb.content.api.dto.UserVideoPost;
 import cn.reghao.tnb.content.api.dto.VideoRegion;
 import cn.reghao.tnb.content.api.dto.VideoSearch;
 import cn.reghao.tnb.content.api.dto.VideoUrls;
-import cn.reghao.tnb.content.app.vod.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.vod.service.AdminVodService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/vo/SelectOption.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.content.app.vod.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2021-06-03 19:00:57
- */
-@AllArgsConstructor
-@Getter
-public class SelectOption {
-    private String key;
-    private String value;
-}

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AlbumService.java

@@ -223,7 +223,7 @@ public class AlbumService {
         return list.stream().map(postAlbum -> {
             long albumId = postAlbum.getAlbumId();
             String albumName = postAlbum.getAlbumName();
-            return new SelectOption(albumName, albumId);
+            return new SelectOption(albumName, albumId+"");
         }).collect(Collectors.toList());
     }
 

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

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.file.app.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.model.vo.StoreDiskInfo;
 import cn.reghao.tnb.file.app.model.vo.StoreNodeInfo;
 import cn.reghao.tnb.file.app.service.StoreNodeService;

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

@@ -7,7 +7,7 @@ import cn.reghao.oss.sdk.model.constant.ObjectScope;
 import cn.reghao.oss.sdk.model.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
-import cn.reghao.tnb.file.app.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.model.vo.UploadChannelInfo;
 import cn.reghao.tnb.file.app.model.vo.UserNodeInfo;
 import cn.reghao.tnb.file.app.service.UploadChannelService;

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

@@ -4,7 +4,7 @@ import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.UserNodeDto;
-import cn.reghao.tnb.file.app.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.model.vo.UserNodeInfo;
 import cn.reghao.tnb.file.app.service.UserNodeService;
 import io.swagger.v3.oas.annotations.Operation;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/SelectOption.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.file.app.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2021-06-03 19:00:57
- */
-@AllArgsConstructor
-@Getter
-public class SelectOption {
-    private String label;
-    private String value;
-}

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

@@ -12,7 +12,7 @@ import cn.reghao.tnb.file.app.db.mapper.UserNodeMapper;
 import cn.reghao.tnb.file.app.db.repository.StoreRepository;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.po.StoreVolume;
-import cn.reghao.tnb.file.app.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.model.vo.StoreDiskInfo;
 import cn.reghao.tnb.file.app.model.vo.StoreNodeInfo;
 import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;

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

@@ -9,7 +9,7 @@ import cn.reghao.tnb.file.app.model.dto.UserNodeDto;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.model.po.UserNode;
-import cn.reghao.tnb.file.app.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.model.vo.UserNodeInfo;
 import org.springframework.stereotype.Service;
 

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/controller/TnbLogController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.search.app.soa.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.search.app.soa.model.vo.SelectOption;
+import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.search.app.soa.service.LoggingService;
 import cn.reghao.tnb.search.app.soa.service.RuntimeLogService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -65,14 +65,14 @@ public class TnbLogController {
                     .map(appName -> new SelectOption(appName, appName))
                     .collect(Collectors.toList());
             if (app == null) {
-                app = appList.get(0).getKey();
+                app = appList.get(0).getValue();
             }
 
             hostList = map.get(app).stream()
                     .map(host1 -> new SelectOption(host1, host1))
                     .collect(Collectors.toList());
             if (host == null) {
-                host = hostList.get(0).getKey();
+                host = hostList.get(0).getValue();
             }
         } else {
             appList = Collections.emptyList();

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/model/vo/SelectOption.java

@@ -1,15 +0,0 @@
-package cn.reghao.tnb.search.app.soa.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2021-06-03 19:00:57
- */
-@AllArgsConstructor
-@Getter
-public class SelectOption {
-    private String key;
-    private String value;
-}