临时车辆审批修改，临时车辆创建不bug修改

logs/xxl-job/2026-07-23/9245629.log

@@ -1,3 +0,0 @@
-2026-07-23 00:09:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-176] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-23 00:09:58 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-176] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-23 00:09:58 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-23/9245741.log

@@ -1,3 +0,0 @@
-2026-07-23 00:13:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-177] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-23 00:13:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-177] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-23 00:13:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-23/9245919.log

@@ -1,3 +0,0 @@
-2026-07-23 00:19:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-178] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-23 00:19:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-178] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-23 00:19:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-23/9246062.log

@@ -1,3 +0,0 @@
-2026-07-23 00:24:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-179] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-23 00:24:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-179] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-23 00:24:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-23/9247146.log

@@ -1,3 +0,0 @@
-2026-07-23 00:59:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-180] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-23 00:59:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-180] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-23 00:59:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-25/9334840.log

@@ -1,3 +0,0 @@
-2026-07-25 00:09:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-179] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-25 00:09:58 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-179] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-25 00:09:58 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-25/9334958.log

@@ -1,3 +0,0 @@
-2026-07-25 00:13:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-180] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-25 00:13:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-180] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-25 00:13:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-25/9335140.log

@@ -1,3 +0,0 @@
-2026-07-25 00:19:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-181] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-25 00:19:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-181] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-25 00:19:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-25/9335284.log

@@ -1,3 +0,0 @@
-2026-07-25 00:24:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-182] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-25 00:24:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-182] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-25 00:24:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-25/9336371.log

@@ -1,3 +0,0 @@
-2026-07-25 00:59:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-183] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-25 00:59:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-183] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-25 00:59:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-26/9379682.log

@@ -1,3 +0,0 @@
-2026-07-26 00:09:58 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-184] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-26 00:09:58 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-184] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-26 00:09:58 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-26/9379801.log

@@ -1,3 +0,0 @@
-2026-07-26 00:13:58 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-185] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-26 00:13:58 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-185] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-26 00:13:58 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-26/9379974.log

@@ -1,3 +0,0 @@
-2026-07-26 00:19:58 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-186] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-26 00:19:58 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-186] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-26 00:19:58 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-26/9380119.log

@@ -1,3 +0,0 @@
-2026-07-26 00:24:58 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-187] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-26 00:24:58 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-187] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-26 00:24:58 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

logs/xxl-job/2026-07-26/9381209.log

@@ -1,3 +0,0 @@
-2026-07-26 00:59:57 [com.xxl.job.core.thread.JobThread#run]-[130]-[Thread-188] <br>----------- xxl-job job execute start -----------<br>----------- Param:null
-2026-07-26 00:59:57 [com.xxl.job.core.thread.JobThread#run]-[176]-[Thread-188] <br>----------- xxl-job job execute end(finish) -----------<br>----------- Result: handleCode=200, handleMsg = null
-2026-07-26 00:59:57 [com.xxl.job.core.thread.TriggerCallbackThread#callbackLog]-[197]-[xxl-job, executor TriggerCallbackThread] <br>----------- xxl-job job callback finish.

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

@@ -8,6 +8,7 @@ import com.zcloud.gbscommon.dahua.cmd.DaHuaCarAddCmd;
 import com.zcloud.gbscommon.dahua.cmd.DaHuaTempVehicleSaveCmd;
 import com.zcloud.primeport.domain.model.VehicleApplyE;
 import com.zcloud.primeport.plan.mjDevice.dto.CarEnum;
+import jodd.util.Base64;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -28,11 +29,16 @@ public class DaHuaVehicleSyncExe {
     public void syncApprovedVehicle(Long vehicleApplyId) {
         VehicleApplyE vehicle = vehicleApplyGateway.getById(vehicleApplyId);
         if (vehicle == null) {
+            log.warn("同步大华车辆失败: 车辆申请不存在, vehicleApplyId={}", vehicleApplyId);
             return;
         }
+        log.info("同步大华车辆: vehicleApplyId={}, licenceNo={}, vehicleBelongType={}", 
+                vehicleApplyId, vehicle.getLicenceNo(), vehicle.getVehicleBelongType());
         if (isRelatedPartyVehicle(vehicle)) {
+            log.info("识别为相关方车辆, 走addCar接口");
             syncAddedVehicle(vehicle);
-        } else if (isTempVehicle(vehicle)) {
+        } else {
+            log.info("识别为非相关方车辆(vehicleBelongType={}), 走saveTempVehicle接口", vehicle.getVehicleBelongType());
             syncTempVehicle(vehicle);
         }
     }
@@ -76,19 +82,39 @@ public class DaHuaVehicleSyncExe {
     private DaHuaTempVehicleSaveCmd buildTempVehicleCmd(VehicleApplyE vehicle) {
         DaHuaTempVehicleSaveCmd cmd = new DaHuaTempVehicleSaveCmd();
         cmd.setName(vehicle.getEmployeeVehicleUserName());
-        cmd.setCode(vehicle.getLsUserIdcard());
+        String idcard = vehicle.getLsUserIdcard();
-        cmd.setPaperNumber(vehicle.getLsUserIdcard());
+        if (idcard != null && !idcard.isEmpty()) {
+            try {
+                idcard = Base64.decodeToString(idcard);
+                log.info("身份证base64解码成功: {}", idcard);
+            } catch (Exception e) {
+                log.warn("身份证base64解码失败，使用原值: {}", e.getMessage());
+            }
+        }
+        cmd.setCode(idcard);
+        cmd.setPaperType(111);
+        cmd.setPaperNumber(idcard);
         cmd.setPhone(vehicle.getLsUserPhone());
         cmd.setService("evo-thirdParty");
         cmd.setValidStartTime(vehicle.getVisitStartTime());
         cmd.setValidEndTime(vehicle.getVisitEndTime());
-        if (vehicle.getVehicleCorpId() != null) {
+
-            cmd.setDepartmentId(vehicle.getVehicleCorpId());
+        Long departmentId = null;
+        if (vehicle.getVehicleDepartmentId() != null) {
+            departmentId = daHuaGateway.findDahuaDepartmentIdByCorpId(vehicle.getVehicleDepartmentId());
+            if (departmentId == null) {
+                log.warn("未找到部门映射, vehicleDepartmentId={}, 使用默认值1", vehicle.getVehicleDepartmentId());
+            }
         }
+        if (departmentId == null) {
+            departmentId = 1L;
+        }
+        cmd.setDepartmentId(departmentId);
+
         DaHuaTempVehicleSaveCmd.CarItem carItem = new DaHuaTempVehicleSaveCmd.CarItem();
         carItem.setCarNum(vehicle.getLicenceNo());
         carItem.setCarNumColor(CarEnum.getMenuKeyByPath(vehicle.getLicenceType()));
-        carItem.setDepartmentId(vehicle.getVehicleCorpId());
+        carItem.setDepartmentId(departmentId);
         carItem.setDepartmentName(vehicle.getVehicleDepartmentName());
         cmd.setCars(Collections.singletonList(carItem));
         return cmd;
@@ -99,11 +125,6 @@ public class DaHuaVehicleSyncExe {
                 && VehicleBelongTypeEnum.XGF_VEHICLES.getCode().equals(vehicle.getVehicleBelongType());
     }
 
-    private boolean isTempVehicle(VehicleApplyE vehicle) {
-        return vehicle != null
-                && VehicleBelongTypeEnum.TEMP_VEHICLES.getCode().equals(vehicle.getVehicleBelongType());
-    }
-
     private void checkResult(Map<String, Object> result, String message) {
         if (result == null || !Boolean.TRUE.equals(result.get("passed"))) {
             Object errorMessage = result == null ? null : result.get("errMsg");

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

@@ -79,8 +79,17 @@ public class VehicleApplyAddExe {
         }
         // 临时
         if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode())){
-            examTypeE.setEmployeeVehicleUserName(cmd.getDrivingUserName());
+            examTypeE.setDrivingUserName(cmd.getEmployeeVehicleUserName());
-//            examTypeE.setLsUserIdcard(Base64.encodeToString(cmd.getLsUserIdcard()));
+            examTypeE.setEmployeeVehicleUserName(cmd.getEmployeeVehicleUserName());
+            if (cmd.getVehicleCorpId() == null) {
+                SSOUser user = AuthContext.getCurrentUser();
+                if (user != null) {
+                    examTypeE.setVehicleCorpId(user.getTenantId());
+                    examTypeE.setVehicleCorpName(user.getTenantName());
+                    examTypeE.setVehicleDepartmentId(user.getOrgId());
+                    examTypeE.setVehicleDepartmentName(user.getOrgName());
+                }
+            }
         }
         VehicleApplyE add = vehicleApplyGateway.add(examTypeE);
         VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1)
@@ -101,5 +110,4 @@ public class VehicleApplyAddExe {
 
         return add;
     }
-}
+}
-

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

@@ -13,6 +13,7 @@ import com.zcloud.primeport.domain.model.VehicleAuditE;
 import com.zcloud.primeport.dto.VehicleAuditUpdateCmd;
 import com.zcloud.primeport.plan.mjDevice.CarDockUtil;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,7 @@ import java.util.Map;
  */
 @Component
 @AllArgsConstructor
+@Slf4j
 public class VehicleAuditUpdateExe {
     private final VehicleAuditGateway vehicleAuditGateway;
     private final VehicleApplyGateway vehicleApplyGateway;
@@ -50,6 +52,7 @@ public class VehicleAuditUpdateExe {
 
     @Transactional(rollbackFor = Exception.class)
     public void audit(VehicleAuditUpdateCmd cmd) {
+        log.info("开始审批: id={}, vehicleApplyId={}, auditStatus={}", cmd.getId(), cmd.getVehicleApplyId(), cmd.getAuditStatus());
         if (!(cmd.getAuditStatus().equals(2) || cmd.getAuditStatus().equals(3))) {
             throw new BizException("审批状态必须是通过或不通过");
         }
@@ -68,16 +71,22 @@ public class VehicleAuditUpdateExe {
         vehicleAuditGateway.update(vehicleAuditE);
 
         VehicleApplyE vehicleApplyE1 = vehicleApplyGateway.getById(cmd.getVehicleApplyId());
+        log.info("查询车辆信息: vehicleBelongType={}", vehicleApplyE1 != null ? vehicleApplyE1.getVehicleBelongType() : "null");
 
         // 审批通过 进行数据对接。
         if (cmd.getAuditStatus().equals(2)) {
+            log.info("审批通过, 开始数据对接");
             if (vehicleApplyE1 != null && (vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode()) ||
                     vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.XGF_VEHICLES.getCode()))) {
+                log.info("执行车辆对接: {}", vehicleApplyE1.getLicenceNo());
                 carDockUtil.execute(vehicleApplyE1.getLicenceNo());
             } else {
+                log.info("执行内部车辆对接");
                 carDockUtil.executeInternalVehicle(vehicleApplyE1);
             }
+            log.info("开始同步大华平台");
             daHuaVehicleSyncExe.syncApprovedVehicle(cmd.getVehicleApplyId());
+            log.info("同步大华平台完成");
         }
 
         // 完成待办
@@ -99,5 +108,4 @@ public class VehicleAuditUpdateExe {
         }
 
     }
-}
+}
-

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java

@@ -115,5 +115,4 @@ public class VehicleApplyAddCmd extends Command {
     @ApiModelProperty(value = "审核用户名称", name = "auditUserName")
     private String auditUserName;
 
-}
+}
-

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

@@ -26,7 +26,7 @@ public class DaHuaPersonApi {
     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/subsystem/third/upload/img";
-    private static final String TEMP_VEHICLE_AUDIT_URL = "/evo-apigw/evo-brm/1.0.0/tempVehicle/saveAudit";
+    private static final String TEMP_VEHICLE_AUDIT_URL = "/evo-apigw/evo-brm/1.2.0/person/subsystem/save-person-all";
 
     public boolean isConfigured() {
         return daHuaApiClient != null;

web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/DaHuaGatewayImpl.java

@@ -986,6 +986,7 @@ public class DaHuaGatewayImpl implements DaHuaGateway {
         }
         Map<String, Object> body = convertToMap(cmd);
         processTempVehicleBiosignatures(body);
+        cleanNullFieldsFromCars(body);
         System.out.println("==========[saveTempVehicle 完整请求参数 START]==========");
         System.out.println(JSONUtil.toJsonPrettyStr(body));
         log.info("大华临时车辆全量保存请求参数: {}", JSONUtil.toJsonStr(body));
@@ -1155,6 +1156,40 @@ public class DaHuaGatewayImpl implements DaHuaGateway {
         body.put("personBiosignatures", outList);
     }
 
+    @SuppressWarnings("unchecked")
+    private void cleanNullFieldsFromCars(Map<String, Object> body) {
+        Object carsObj = body.get("cars");
+        if (carsObj == null || !(carsObj instanceof List)) return;
+        List<Object> cars = (List<Object>) carsObj;
+        List<Map<String, Object>> cleanedCars = new ArrayList<>();
+        for (Object car : cars) {
+            Map<String, Object> carMap = new HashMap<>();
+            if (car instanceof Map) {
+                Map<String, Object> mm = (Map<String, Object>) car;
+                for (Map.Entry<String, Object> entry : mm.entrySet()) {
+                    if (entry.getValue() != null) {
+                        carMap.put(entry.getKey(), entry.getValue());
+                    }
+                }
+            } else {
+                try {
+                    Field[] fields = car.getClass().getDeclaredFields();
+                    for (Field field : fields) {
+                        field.setAccessible(true);
+                        Object value = field.get(car);
+                        if (value != null) {
+                            carMap.put(field.getName(), value);
+                        }
+                    }
+                } catch (Exception e) {
+                    log.warn("清理CarItem null字段失败: {}", e.getMessage());
+                }
+            }
+            cleanedCars.add(carMap);
+        }
+        body.put("cars", cleanedCars);
+    }
+
     @Override
     public Long findDahuaDepartmentIdByCorpId(Long corpId) {
         if (corpId == null) {

web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java

@@ -95,5 +95,4 @@ public class VehicleApplyGatewayImpl implements VehicleApplyGateway {
         objectUpdateWrapper.eq("licence_no", vehicleApplyE.getLicenceNo());
         vehicleApplyRepository.update(objectUpdateWrapper);
     }
-}
+}
-

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java

@@ -108,7 +108,9 @@ public class VehicleApplyDO extends BaseDO {
     private String mkmjName;
     private String lsUserPhone;
     private String lsUserIdcard;
+    @TableField("driving_user_id")
     private Long drivingUserId;
+    @TableField("driving_user_name")
     private String drivingUserName;
     @ApiModelProperty(value = "审核企业")
     @TableField(exist = false)
@@ -144,5 +146,4 @@ public class VehicleApplyDO extends BaseDO {
     private String belongType;
     @TableField(exist = false)
     private int waitAuditCount;
-}
+}
-