From 9d7af74009e90138f6ea2d363a69ff927cf66b65 Mon Sep 17 00:00:00 2001
From: GoblinsWang <806586736@qq.com>
Date: Thu, 23 Mar 2023 16:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E5=BA=93=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/ResourcesController.java      |  3 ++-
 .../server/mappers/FaceLibraryMapper.java     |  2 ++
 .../services/impl/FaceLibraryServiceImpl.java | 20 +++++++++----------
 .../src/main/resources/application-dev.yml    |  2 +-
 .../mybatis/mapper/FaceLibraryMapper.xml      | 12 +++++++++++
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java b/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java
index 218e0a3..ea3d20e 100644
--- a/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java
+++ b/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java
@@ -68,12 +68,13 @@ public class ResourcesController  extends CommonResult {
     @NoRepeatSubmitAnnotation(prefix = "Resources/faceLib")
     public CommonResult addFaceLibrary(@ApiParam(required = true, name = "faceLibrary", value = "{\n" +
             "  \"factoryName\": \"库名称\",\n" +
-            "  \"factoryType\": \"库类型\",\n" +
             "  \"remarks\": \"备注\"\n" +
             "}")@RequestBody FaceLibrary faceLibrary){
         if (UtilValidate.isEmpty(faceLibrary.getFactoryName())){
             throw new DkException("库名称不能为空");
         }
+        faceLibrary.setIdFactory(System.currentTimeMillis());
+        faceLibrary.setFactoryType("0");
         faceLibrary.setIsValid(YNEnums.YES.code);
         faceLibrary.setCreateTime(new Date());
         faceLibrary.setUpdateTime(new Date());
diff --git a/face-server/src/main/java/com/dkha/server/mappers/FaceLibraryMapper.java b/face-server/src/main/java/com/dkha/server/mappers/FaceLibraryMapper.java
index 945c4cc..20e4cd0 100644
--- a/face-server/src/main/java/com/dkha/server/mappers/FaceLibraryMapper.java
+++ b/face-server/src/main/java/com/dkha/server/mappers/FaceLibraryMapper.java
@@ -32,4 +32,6 @@ public interface FaceLibraryMapper extends BaseMapper<FaceLibrary> {
      * @return
      */
      Integer getLibraryCount(@Param("idFactory") Long idFactory);
+
+    FaceLibrary getLibrary(@Param("factoryName") String factoryName);
 }
diff --git a/face-server/src/main/java/com/dkha/server/services/impl/FaceLibraryServiceImpl.java b/face-server/src/main/java/com/dkha/server/services/impl/FaceLibraryServiceImpl.java
index 71085db..8748909 100644
--- a/face-server/src/main/java/com/dkha/server/services/impl/FaceLibraryServiceImpl.java
+++ b/face-server/src/main/java/com/dkha/server/services/impl/FaceLibraryServiceImpl.java
@@ -67,19 +67,19 @@ public class FaceLibraryServiceImpl extends ServiceImpl<FaceLibraryMapper, FaceL
     @Transactional(rollbackFor = Exception.class)
     public FaceLibrary addLibrary(FaceLibrary faceLibrary) {
         try {
-            FaceLibraryVO faceLibraryVO = new FaceLibraryVO();
-            faceLibraryVO.setName(faceLibrary.getFactoryName());
-            if(UtilValidate.isNotEmpty(faceLibrary.getFactoryType())) {
-                faceLibraryVO.setType(faceLibrary.getFactoryType());
+            if (faceLibraryMapper.getLibrary(faceLibrary.getFactoryName()) != null) {
+                throw new DkException("库名称已存在");
+            }
+            FaceLibraryVO faceLibraryVO = new FaceLibraryVO();
+            faceLibraryVO.setLibraryId(faceLibrary.getIdFactory().toString());
+            faceLibraryVO.setName(faceLibrary.getFactoryName());
+            String result = (String) httpUtil.post(link + ApiUrlEnum.FACELIB_POSTURL.getUrl(), faceLibraryVO, String.class);
+            if(! result.equals("ok")){
+                throw new DkException("算法端新增库失败");
             }
-            ApiVO faceLibrary1 = (ApiVO) httpUtil.post(link+ ApiUrlEnum.FACELIB_POSTURL.getUrl(), faceLibraryVO, ApiVO.class);
-            /**调用API*/
-            String json = gson.toJson(faceLibrary1.getData());
-            FaceLibraryVO face = gson.fromJson(json, FaceLibraryVO.class);
-            faceLibrary.setIdFactory(Long.parseLong(face.getLibraryId()));
             int insert = faceLibraryMapper.insert(faceLibrary);
             if(insert<0){
-                throw new DkException("新增库失败");
+                throw new DkException("MySQL新增库失败");
             }
         }catch (Exception e){
             throw new DkException("新增库失败"+e.getMessage());
diff --git a/face-server/src/main/resources/application-dev.yml b/face-server/src/main/resources/application-dev.yml
index fa1f4c3..c051148 100644
--- a/face-server/src/main/resources/application-dev.yml
+++ b/face-server/src/main/resources/application-dev.yml
@@ -25,7 +25,7 @@ spring:
     druid:
       #MySQL
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://192.168.1.127:3306/face_application?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.1.127:3306/face_application_23_3?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
       username: root
       password: Dkha123
       initial-size: 10
diff --git a/face-server/src/main/resources/mybatis/mapper/FaceLibraryMapper.xml b/face-server/src/main/resources/mybatis/mapper/FaceLibraryMapper.xml
index 121f854..2071efc 100644
--- a/face-server/src/main/resources/mybatis/mapper/FaceLibraryMapper.xml
+++ b/face-server/src/main/resources/mybatis/mapper/FaceLibraryMapper.xml
@@ -23,4 +23,16 @@
     <select id="getLibraryCount" resultType="java.lang.Integer">
         select COUNT(*)  from portrait p where p.is_valid='Y'and p.id_factory= #{idFactory}
     </select>
+    <select id="getLibrary" resultType="com.dkha.server.modules.entities.FaceLibrary">
+        SELECT
+            f.id_factory as idFactory,
+            f.factory_name as factoryName,
+            f.factory_type as factoryType,
+            f.remarks,
+            f.create_time as createTime
+        FROM
+            face_library f
+        WHERE
+            f.id_factory = #{factoryName}
+    </select>
 </mapper>