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 | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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..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
@@ -76,6 +76,14 @@
Assert.hasKeyAndValue(reqJson, "authCode", "蹇呭～锛岃濉啓閴存潈缂栫爜");
Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭～锛岃閫夋嫨浣嶇疆绫诲瀷");
+ MachineDto machineDto = new MachineDto();
+ machineDto.setMachineCode(reqJson.getString("machineCode"));
+ int count = machineV1InnerServiceSMOImpl.queryMachinesCount(machineDto);
+
+ if (count > 0) {
+ throw new CmdException("璁惧宸插瓨鍦�");
+ }
+
//灞炴�ф牎楠�
Assert.judgeAttrValue(reqJson);
@@ -84,16 +92,25 @@
@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"))
+ && !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 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");
+ }
+
machinePo.setMachineId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
machinePo.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
machinePo.setState(MachineDto.MACHINE_STATE_ON);
@@ -103,12 +120,12 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
- dealMachineAttr(reqJson,machinePo);
+ dealMachineAttr(reqJson, machinePo);
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
- private void dealMachineAttr(JSONObject paramObj,MachinePo machinePo) {
+ private void dealMachineAttr(JSONObject paramObj, MachinePo machinePo) {
if (!paramObj.containsKey("attrs")) {
return;
--
Gitblit v1.8.0