大华微服务修改微服务

web-app/src/main/java/com/zcloud/primeport/command/DaHuaPersonSyncExe.java

@@ -4,7 +4,7 @@ import com.alibaba.cola.exception.BizException;
 import com.zcloud.gbscommon.utils.Base64Util;
 import com.zcloud.primeport.domain.gateway.DaHuaGateway;
 import com.zcloud.primeport.domain.gateway.PersonApplyGateway;
-import com.zcloud.primeport.domain.model.DaHuaPersonSyncCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaPersonSyncCmd;
 import com.zcloud.primeport.domain.model.PersonApplyE;
 import com.zcloud.primeport.domain.model.XgfApplyPersonE;
 import com.zcloud.primeport.dto.PersonApplyUpdateCmd;
@@ -185,4 +185,4 @@ public class DaHuaPersonSyncExe {
             throw new BizException(message + (errorMessage == null ? "" : ": " + errorMessage));
         }
     }
-}
+}

web-app/src/main/java/com/zcloud/primeport/command/DaHuaVehicleSyncExe.java

@@ -4,7 +4,7 @@ import com.alibaba.cola.exception.BizException;
 import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum;
 import com.zcloud.primeport.domain.gateway.DaHuaGateway;
 import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
-import com.zcloud.primeport.domain.model.DaHuaCarAddCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaCarAddCmd;
 import com.zcloud.primeport.domain.model.VehicleApplyE;
 import com.zcloud.primeport.plan.mjDevice.dto.CarEnum;
 import lombok.AllArgsConstructor;
@@ -79,4 +79,4 @@ public class DaHuaVehicleSyncExe {
             throw new BizException(message + (errorMessage == null ? "" : ": " + errorMessage));
         }
     }
-}
+}

web-app/src/main/java/com/zcloud/primeport/service/DaHuaAccessRecordSyncApplicationService.java

@@ -6,7 +6,7 @@ import com.zcloud.primeport.domain.gateway.DaHuaGateway;
 import com.zcloud.primeport.domain.gateway.DaHuaResourceRepositoryGateway;
 import com.zcloud.primeport.domain.gateway.DaHuaAccessRecordSyncGateway;
 import com.zcloud.primeport.domain.model.CorpInfoSnapshotE;
-import com.zcloud.primeport.domain.model.DaHuaAccessRecordCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaAccessRecordCmd;
 import com.zcloud.primeport.domain.model.DaHuaAccessRecordE;
 import com.zcloud.primeport.domain.model.DaHuaAccessRecordSyncResultE;
 import com.zcloud.primeport.domain.model.DaHuaDepartmentCorpMappingE;
@@ -454,4 +454,4 @@ public class DaHuaAccessRecordSyncApplicationService implements DaHuaAccessRecor
         private final Map<String, List<DaHuaDepartmentCorpMappingE>> mappingsByDepartmentName =
                 new HashMap<>();
     }
-}
+}

web-app/src/main/java/com/zcloud/primeport/service/DaHuaServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -242,7 +243,6 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade {
         return resp;
     }
 
-    @Override
     public SingleResponse<DaHuaAccessRecordSyncResultCO> syncAccessRecords(DaHuaAccessRecordSyncCmd cmd) {
         int pageSize = cmd.getPageSize() == null ? 1000 : cmd.getPageSize();
         DaHuaAccessRecordSyncResultE result = daHuaAccessRecordSyncApplicationService.sync(
@@ -296,4 +296,4 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade {
         BeanUtils.copyProperties(result, data);
         return SingleResponse.of(data);
     }
-}
+}

web-domain/src/main/java/com/zcloud/primeport/domain/gateway/DaHuaGateway.java

@@ -1,9 +1,10 @@
 package com.zcloud.primeport.domain.gateway;
 
-import com.zcloud.primeport.domain.model.DaHuaAccessRecordCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaAccessRecordCmd;
-import com.zcloud.primeport.domain.model.DaHuaCarAddCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaCarAddCmd;
-import com.zcloud.primeport.domain.model.DaHuaCarPageCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaCarPageCmd;
-import com.zcloud.primeport.domain.model.DaHuaPersonSyncCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaPersonSyncCmd;
+import com.zcloud.gbscommon.dahua.cmd.DaHuaTempVehicleSaveCmd;
 
 import java.util.List;
 import java.util.Map;
@@ -29,4 +30,10 @@ public interface DaHuaGateway {
     Map<String, Object> deleteCar(List<String> carNumList);
 
     Map<String, Object> queryAccessRecord(DaHuaAccessRecordCmd cmd);
-}
+
+    String uploadPersonImg(String imageBase64);
+
+    Map<String, Object> saveTempVehicle(DaHuaTempVehicleSaveCmd cmd);
+
+    Long findDahuaDepartmentIdByCorpId(Long corpId);
+}

web-infrastructure/src/main/java/com/zcloud/primeport/dahua/api/DaHuaPersonApi.java

@@ -25,6 +25,8 @@ public class DaHuaPersonApi {
     private static final String CAR_PAGE_URL = "/evo-apigw/evo-brm/1.2.0/car/subsystem/page";
     private static final String CAR_DELETE_URL = "/evo-apigw/evo-brm/1.0.0/car/delete";
     private static final String ACCESS_RECORD_URL = "/evo-apigw/evo-accesscontrol/1.0.0/card/accessControl/swingCardRecord/bycondition/combined";
+    private static final String UPLOAD_PERSON_IMG_URL = "/evo-apigw/evo-brm/1.0.0/person/uploadFace";
+    private static final String TEMP_VEHICLE_AUDIT_URL = "/evo-apigw/evo-brm/1.0.0/tempVehicle/saveAudit";
 
     public boolean isConfigured() {
         return daHuaApiClient != null;
@@ -131,4 +133,26 @@ public class DaHuaPersonApi {
         headers.put("Authorization", "bearer " + token);
         return daHuaApiClient.postJson(ACCESS_RECORD_URL, body, headers);
     }
-}
+
+    public GeneralResponse uploadPersonImg(String imageBase64) throws ClientException {
+        if (daHuaApiClient == null) {
+            return null;
+        }
+        String token = daHuaApiClient.getToken();
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "bearer " + token);
+        Map<String, Object> body = new HashMap<>();
+        body.put("faceData", imageBase64);
+        return daHuaApiClient.postJson(UPLOAD_PERSON_IMG_URL, body, headers);
+    }
+
+    public GeneralResponse saveTempVehicleAudit(Map<String, Object> body) throws ClientException {
+        if (daHuaApiClient == null) {
+            return null;
+        }
+        String token = daHuaApiClient.getToken();
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "bearer " + token);
+        return daHuaApiClient.postJson(TEMP_VEHICLE_AUDIT_URL, body, headers);
+    }
+}