From f89d6890ff8e30eaa165c6a45f0696789d24d57b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 八月 2022 10:50:31 +0800
Subject: [PATCH] 优化 考勤同步功能
---
service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java
index 0102f56..8385731 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java
@@ -84,16 +84,20 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
- CommunityLocationDto communityLocationDto = new CommunityLocationDto();
- communityLocationDto.setCommunityId(reqJson.getString("communityId"));
- communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));
- List<CommunityLocationDto> locationDtos = communityLocationV1InnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
-
- Assert.listOnlyOne(locationDtos, "浣嶇疆涓嶅瓨鍦�");
-
MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
- machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
+
+ if(!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))){
+ CommunityLocationDto communityLocationDto = new CommunityLocationDto();
+ communityLocationDto.setCommunityId(reqJson.getString("communityId"));
+ communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));
+ List<CommunityLocationDto> locationDtos = communityLocationV1InnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+ Assert.listOnlyOne(locationDtos, "浣嶇疆涓嶅瓨鍦�");
+ machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
+ }else{
+ machinePo.setLocationObjId("-1");
+ machinePo.setLocationTypeCd("-1");
+ }
+
machinePo.setMachineId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
machinePo.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
machinePo.setState(MachineDto.MACHINE_STATE_ON);
--
Gitblit v1.8.0