From bbd77af32f3d613eabc31d92ae7720d7d187d138 Mon Sep 17 00:00:00 2001 From: zhangxiongfeng Date: Wed, 5 Aug 2026 11:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=8D=8E=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/service/DaHuaServiceImpl.java | 76 ------------------- 1 file changed, 76 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/primeport/service/DaHuaServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/DaHuaServiceImpl.java index 2e0ede3..569dcf7 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/DaHuaServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/DaHuaServiceImpl.java @@ -11,14 +11,7 @@ import com.zcloud.gbscommon.dahua.cmd.DaHuaPersonSyncCmd; import com.zcloud.gbscommon.dahua.cmd.DaHuaTempVehicleSaveCmd; import com.zcloud.gbscommon.dahua.facade.ZcloudDaHuaFacade; import com.zcloud.primeport.domain.gateway.DaHuaGateway; -import com.zcloud.primeport.domain.model.DaHuaAccessRecordSyncResultE; -import com.zcloud.primeport.domain.model.DaHuaResourceSyncResultE; -import com.zcloud.primeport.dto.DaHuaAccessRecordSyncCmd; -import com.zcloud.primeport.dto.DaHuaResourceSyncCmd; -import com.zcloud.primeport.dto.clientobject.DaHuaAccessRecordSyncResultCO; -import com.zcloud.primeport.dto.clientobject.DaHuaResourceSyncResultCO; import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,12 +25,6 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { @Autowired private DaHuaGateway daHuaGateway; - @Autowired - private DaHuaResourceSyncApplicationService daHuaResourceSyncApplicationService; - - @Autowired - private DaHuaAccessRecordSyncApplicationService daHuaAccessRecordSyncApplicationService; - private Long resolveDahuaDeptId(Long corpId) { if (corpId == null) { return null; @@ -103,7 +90,6 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { resp.setErrCode(dhCode); resp.setErrMessage(dhErrMsg); resp.setData(passed); - System.out.println("大华修改人员最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data:" + resp.getData()); return resp; } @@ -119,7 +105,6 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { resp.setErrCode(dhCode); resp.setErrMessage(dhErrMsg); resp.setData(passed); - System.out.println("大华删除人员最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data:" + resp.getData()); return resp; } @@ -136,47 +121,12 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { resp.setErrCode(dhCode); resp.setErrMessage(dhErrMsg); resp.setData(passed); - System.out.println("大华新增车辆最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data:" + resp.getData()); return resp; } @Override public SingleResponse updateCar(DaHuaCarAddCmd cmd) { cmd.setDepartmentId(resolveDahuaDeptId(cmd.getDepartmentId())); - if ((cmd.getCarCode() == null || cmd.getCarCode().trim().isEmpty()) - && cmd.getCarNum() != null && !cmd.getCarNum().trim().isEmpty()) { - DaHuaCarPageCmd pageCmd = new DaHuaCarPageCmd(); - pageCmd.setCarNumList(java.util.Collections.singletonList(cmd.getCarNum())); - System.out.println("大华修改车辆：carCode为空，尝试根据carNum=" + cmd.getCarNum() + "查询carCode"); - Map pageResult = daHuaGateway.pageCar(pageCmd); - Boolean pagePassed = (Boolean) pageResult.get("passed"); - @SuppressWarnings("unchecked") - Map pageDataMap = (Map) pageResult.get("data"); - if (pagePassed != null && pagePassed && pageDataMap != null) { - Object pageDataObj = pageDataMap.get("pageData"); - if (pageDataObj instanceof java.util.List) { - @SuppressWarnings("unchecked") - java.util.List> pageDataList = (java.util.List>) pageDataObj; - for (Map item : pageDataList) { - Object carNumObj = item.get("carNum"); - if (carNumObj != null && cmd.getCarNum().equals(carNumObj.toString())) { - Object carCodeObj = item.get("carCode"); - if (carCodeObj != null) { - String foundCarCode = carCodeObj.toString(); - cmd.setCarCode(foundCarCode); - System.out.println("大华修改车辆：根据carNum=" + cmd.getCarNum() + "自动匹配到carCode=" + foundCarCode); - if (cmd.getDepartmentId() == null && item.get("departmentId") != null) { - Long deptId = Long.valueOf(item.get("departmentId").toString()); - cmd.setDepartmentId(deptId); - System.out.println("大华修改车辆：自动补充departmentId=" + deptId); - } - break; - } - } - } - } - } - } Map updateResult = daHuaGateway.updateCar(cmd); Boolean passed = (Boolean) updateResult.get("passed"); Boolean dhSuccess = (Boolean) updateResult.get("success"); @@ -187,12 +137,10 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { resp.setErrCode(dhCode); resp.setErrMessage(dhErrMsg); resp.setData(passed); - System.out.println("大华修改车辆最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data:" + resp.getData()); return resp; } @Override - @SuppressWarnings("unchecked") public SingleResponse> pageCar(DaHuaCarPageCmd cmd) { Map pageResult = daHuaGateway.pageCar(cmd); Boolean passed = (Boolean) pageResult.get("passed"); @@ -205,7 +153,6 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { resp.setErrCode(dhCode); resp.setErrMessage(dhErrMsg); resp.setData(dhData); - System.out.println("大华车辆分页查询最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data:" + (dhData != null ? "已返回数据" : "null")); return resp; } @@ -221,12 +168,10 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { resp.setErrCode(dhCode); resp.setErrMessage(dhErrMsg); resp.setData(passed); - System.out.println("大华删除车辆最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data:" + resp.getData()); return resp; } @Override - @SuppressWarnings("unchecked") public SingleResponse> queryAccessRecord(DaHuaAccessRecordCmd cmd) { Map queryResult = daHuaGateway.queryAccessRecord(cmd); Boolean passed = (Boolean) queryResult.get("passed"); @@ -243,16 +188,6 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { return resp; } - public SingleResponse syncAccessRecords(DaHuaAccessRecordSyncCmd cmd) { - int pageSize = cmd.getPageSize() == null ? 1000 : cmd.getPageSize(); - DaHuaAccessRecordSyncResultE result = daHuaAccessRecordSyncApplicationService.sync( - cmd.getStartSwingTime(), cmd.getEndSwingTime(), cmd.getStartCreateTime(), - cmd.getEndCreateTime(), pageSize); - DaHuaAccessRecordSyncResultCO data = new DaHuaAccessRecordSyncResultCO(); - BeanUtils.copyProperties(result, data); - return SingleResponse.of(data); - } - @Override public SingleResponse saveTempVehicle(DaHuaTempVehicleSaveCmd cmd) { cmd.setDepartmentId(resolveDahuaDeptId(cmd.getDepartmentId())); @@ -285,15 +220,4 @@ public class DaHuaServiceImpl implements ZcloudDaHuaFacade { System.out.println("大华临时车辆全量保存最终返回 - success:" + resp.isSuccess() + ", errCode:" + resp.getErrCode() + ", errMessage:" + resp.getErrMessage() + ", data(dhData):" + dhData); return resp; } - - public SingleResponse syncResources(DaHuaResourceSyncCmd cmd) { - DaHuaResourceSyncCmd actualCmd = cmd == null ? new DaHuaResourceSyncCmd() : cmd; - int pageSize = actualCmd.getPageSize() == null ? 200 : actualCmd.getPageSize(); - boolean autoMatchByName = actualCmd.getAutoMatchByName() == null || actualCmd.getAutoMatchByName(); - DaHuaResourceSyncResultE result = daHuaResourceSyncApplicationService.sync( - pageSize, actualCmd.getSubsystem(), autoMatchByName); - DaHuaResourceSyncResultCO data = new DaHuaResourceSyncResultCO(); - BeanUtils.copyProperties(result, data); - return SingleResponse.of(data); - } } \ No newline at end of file