From 380908e868b088d62c0e572457bffeea1cbfe8f8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 23 二月 2023 02:51:45 +0800
Subject: [PATCH] 优化加入智能水电表厂家
---
service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 059d64f..76d1874 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
@@ -94,14 +94,19 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
- if (!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))) {
+ if (!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))
+ && !MachineDto.MACHINE_TYPE_ATTENDANCE.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 {
+ } else if(MachineDto.MACHINE_TYPE_ATTENDANCE.equals(reqJson.getString("machineTypeCd"))){
+ machinePo.setLocationObjId(reqJson.getString("locationTypeCd"));
+ machinePo.setLocationTypeCd(reqJson.getString("locationTypeCd"));
+ }else {
machinePo.setLocationObjId("-1");
machinePo.setLocationTypeCd("-1");
}
--
Gitblit v1.8.0