diff --git a/face-search-server/src/main/java/com/visual/face/search/server/controller/server/api/AdminControllerApi.java b/face-search-server/src/main/java/com/visual/face/search/server/controller/server/api/AdminControllerApi.java new file mode 100644 index 0000000..6032f8b --- /dev/null +++ b/face-search-server/src/main/java/com/visual/face/search/server/controller/server/api/AdminControllerApi.java @@ -0,0 +1,23 @@ +package com.visual.face.search.server.controller.server.api; + +import com.visual.face.search.server.domain.common.ResponseInfo; + +import java.util.List; +import java.util.Map; + +public interface AdminControllerApi { + + /** + *获取命名空间集合列表 + * @return 命名空间列表 + */ + public ResponseInfo> getNamespaceList(); + + /** + *根据命名空间查看集合列表 + * @param namespace 命名空间 + * @return 集合列表 + */ + public ResponseInfo>> getCollectList(String namespace); + +} diff --git a/face-search-server/src/main/java/com/visual/face/search/server/controller/server/impl/AdminControllerImpl.java b/face-search-server/src/main/java/com/visual/face/search/server/controller/server/impl/AdminControllerImpl.java new file mode 100644 index 0000000..cf04575 --- /dev/null +++ b/face-search-server/src/main/java/com/visual/face/search/server/controller/server/impl/AdminControllerImpl.java @@ -0,0 +1,21 @@ +package com.visual.face.search.server.controller.server.impl; + +import com.visual.face.search.server.controller.base.BaseController; +import com.visual.face.search.server.controller.server.api.AdminControllerApi; +import com.visual.face.search.server.domain.common.ResponseInfo; + +import java.util.List; +import java.util.Map; + +public class AdminControllerImpl extends BaseController implements AdminControllerApi { + + @Override + public ResponseInfo> getNamespaceList() { + return null; + } + + @Override + public ResponseInfo>> getCollectList(String namespace) { + return null; + } +} diff --git a/face-search-server/src/main/java/com/visual/face/search/server/controller/server/restful/AdminController.java b/face-search-server/src/main/java/com/visual/face/search/server/controller/server/restful/AdminController.java new file mode 100644 index 0000000..2168516 --- /dev/null +++ b/face-search-server/src/main/java/com/visual/face/search/server/controller/server/restful/AdminController.java @@ -0,0 +1,34 @@ +package com.visual.face.search.server.controller.server.restful; + +import com.visual.face.search.server.controller.server.impl.AdminControllerImpl; +import com.visual.face.search.server.domain.common.ResponseInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@Api(tags="06、管理员接口") +@RestController("visualAdminController") +@RequestMapping("/visual/admin") +public class AdminController extends AdminControllerImpl { + + @ApiOperation(value="1、获取命名空间集合列表") + @Override + @ResponseBody + @RequestMapping(value = "/getNamespaceList", method = RequestMethod.GET) + public ResponseInfo> getNamespaceList() { + return super.getNamespaceList(); + } + + @ApiOperation(value="2、根据命名空间查看集合列表") + @Override + @ResponseBody + @RequestMapping(value = "/getCollectList", method = RequestMethod.GET) + public ResponseInfo>> getCollectList(@ApiParam(value = "命名空间", name="namespace", required=true) @RequestParam(value = "namespace", required = true) String namespace) { + return super.getCollectList(namespace); + } + +} diff --git a/face-search-server/src/main/java/com/visual/face/search/server/mapper/AdminMapper.java b/face-search-server/src/main/java/com/visual/face/search/server/mapper/AdminMapper.java new file mode 100644 index 0000000..efd171f --- /dev/null +++ b/face-search-server/src/main/java/com/visual/face/search/server/mapper/AdminMapper.java @@ -0,0 +1,10 @@ +package com.visual.face.search.server.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdminMapper { + + + +} diff --git a/face-search-server/src/main/java/com/visual/face/search/server/service/api/AdminService.java b/face-search-server/src/main/java/com/visual/face/search/server/service/api/AdminService.java new file mode 100644 index 0000000..b10e054 --- /dev/null +++ b/face-search-server/src/main/java/com/visual/face/search/server/service/api/AdminService.java @@ -0,0 +1,5 @@ +package com.visual.face.search.server.service.api; + +public interface AdminService { + +} diff --git a/face-search-server/src/main/java/com/visual/face/search/server/service/impl/AdminServiceImpl.java b/face-search-server/src/main/java/com/visual/face/search/server/service/impl/AdminServiceImpl.java new file mode 100644 index 0000000..f99dd68 --- /dev/null +++ b/face-search-server/src/main/java/com/visual/face/search/server/service/impl/AdminServiceImpl.java @@ -0,0 +1,11 @@ +package com.visual.face.search.server.service.impl; + +import com.visual.face.search.server.service.api.AdminService; +import com.visual.face.search.server.service.base.BaseService; +import org.springframework.stereotype.Service; + +@Service("adminCollectService") +public class AdminServiceImpl extends BaseService implements AdminService { + + +} diff --git a/face-search-test/src/main/java/com/visual/face/search/valid/exps/FaceSearchExample.java b/face-search-test/src/main/java/com/visual/face/search/valid/exps/FaceSearchExample.java index 7a11447..50626ec 100644 --- a/face-search-test/src/main/java/com/visual/face/search/valid/exps/FaceSearchExample.java +++ b/face-search-test/src/main/java/com/visual/face/search/valid/exps/FaceSearchExample.java @@ -23,7 +23,7 @@ public class FaceSearchExample { //远程测试服务 //public static String serverHost = "http://face-search.diven.nat300.top"; public static String namespace = "namespace_1"; - public static String collectionName = "collect_20211201_v10"; + public static String collectionName = "collect_20211201_v11"; public static FaceSearch faceSearch = FaceSearch.build(serverHost, namespace, collectionName); /**集合创建*/ @@ -33,7 +33,7 @@ public class FaceSearchExample { sampleColumns.add(FiledColumn.build().setName("name").setDataType(FiledDataType.STRING).setComment("姓名")); //人脸属性字段 List faceColumns = new ArrayList<>(); - faceColumns.add(FiledColumn.build().setName("label").setDataType(FiledDataType.STRING).setComment("标签1")); +// faceColumns.add(FiledColumn.build().setName("label").setDataType(FiledDataType.STRING).setComment("标签1")); //待创建的人脸库信息 Collect collect = Collect.build().setCollectionComment("人脸库").setSampleColumns(sampleColumns).setFaceColumns(faceColumns); //删除集合 @@ -49,7 +49,7 @@ public class FaceSearchExample { /**添加样本数据*/ public static void index(){ - String indexPath = "face-search-test/src/main/resources/image/validate/index"; + String indexPath = "face-search-test/src/main/resources/image/noface"; for(String name : Objects.requireNonNull(new File(indexPath).list())){ System.out.println(name); File files[] = Paths.get(indexPath, name).toFile().listFiles(); @@ -64,7 +64,7 @@ public class FaceSearchExample { if(createSample.ok()){ for(File image : files){ KeyValues faceData = KeyValues.build(); - faceData.add(KeyValue.build("label", "标签-" + name)); +// faceData.add(KeyValue.build("label", "标签-" + name)); String imageBase64 = Base64Util.encode(image.getAbsolutePath()); Face face = Face.build(sampleId).setFaceData(faceData).setImageBase64(imageBase64) .setMinConfidenceThresholdWithThisSample(50f) @@ -122,8 +122,8 @@ public class FaceSearchExample { /**main**/ public static void main(String[] args) { - collect(); - index(); +// collect(); +// index(); search(); } diff --git a/face-search-test/src/main/resources/image/validate/noface/A1/A145981.jpg b/face-search-test/src/main/resources/image/validate/noface/A1/A145981.jpg new file mode 100644 index 0000000..09d721b Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A1/A145981.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A1/A145982.jpg b/face-search-test/src/main/resources/image/validate/noface/A1/A145982.jpg new file mode 100644 index 0000000..d896b83 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A1/A145982.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A1/A145983.jpg b/face-search-test/src/main/resources/image/validate/noface/A1/A145983.jpg new file mode 100644 index 0000000..d3887bc Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A1/A145983.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A1/A145984.jpg b/face-search-test/src/main/resources/image/validate/noface/A1/A145984.jpg new file mode 100644 index 0000000..ad484be Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A1/A145984.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A2/A145985.jpg b/face-search-test/src/main/resources/image/validate/noface/A2/A145985.jpg new file mode 100644 index 0000000..cc4f738 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A2/A145985.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A2/A145986.jpg b/face-search-test/src/main/resources/image/validate/noface/A2/A145986.jpg new file mode 100644 index 0000000..25f837f Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A2/A145986.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A2/A145987.jpg b/face-search-test/src/main/resources/image/validate/noface/A2/A145987.jpg new file mode 100644 index 0000000..be10215 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A2/A145987.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A2/A145988.jpg b/face-search-test/src/main/resources/image/validate/noface/A2/A145988.jpg new file mode 100644 index 0000000..4eab22f Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A2/A145988.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A3/A145989.jpg b/face-search-test/src/main/resources/image/validate/noface/A3/A145989.jpg new file mode 100644 index 0000000..6957597 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A3/A145989.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A3/A145990.jpg b/face-search-test/src/main/resources/image/validate/noface/A3/A145990.jpg new file mode 100644 index 0000000..8d306eb Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A3/A145990.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A3/A145991.jpg b/face-search-test/src/main/resources/image/validate/noface/A3/A145991.jpg new file mode 100644 index 0000000..8fe453b Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A3/A145991.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A3/A145992.jpg b/face-search-test/src/main/resources/image/validate/noface/A3/A145992.jpg new file mode 100644 index 0000000..53a3a97 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A3/A145992.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A4/A145993.jpg b/face-search-test/src/main/resources/image/validate/noface/A4/A145993.jpg new file mode 100644 index 0000000..4729a12 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A4/A145993.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A4/A145994.jpg b/face-search-test/src/main/resources/image/validate/noface/A4/A145994.jpg new file mode 100644 index 0000000..c6ba96b Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A4/A145994.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A4/A145995.jpg b/face-search-test/src/main/resources/image/validate/noface/A4/A145995.jpg new file mode 100644 index 0000000..7f54a6f Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A4/A145995.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A4/A145996.jpg b/face-search-test/src/main/resources/image/validate/noface/A4/A145996.jpg new file mode 100644 index 0000000..8a3a278 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A4/A145996.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A5/A145997.jpg b/face-search-test/src/main/resources/image/validate/noface/A5/A145997.jpg new file mode 100644 index 0000000..966cedb Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A5/A145997.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A5/A145998.jpg b/face-search-test/src/main/resources/image/validate/noface/A5/A145998.jpg new file mode 100644 index 0000000..c77e629 Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A5/A145998.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A5/A145999.jpg b/face-search-test/src/main/resources/image/validate/noface/A5/A145999.jpg new file mode 100644 index 0000000..8fcf77c Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A5/A145999.jpg differ diff --git a/face-search-test/src/main/resources/image/validate/noface/A5/A146000.jpg b/face-search-test/src/main/resources/image/validate/noface/A5/A146000.jpg new file mode 100644 index 0000000..a923ffa Binary files /dev/null and b/face-search-test/src/main/resources/image/validate/noface/A5/A146000.jpg differ