From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 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 59193ff..d9cda6a 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
@@ -60,6 +60,7 @@
@Autowired
private IMachineV1InnerServiceSMO machineV1InnerServiceSMOImpl;
+
@Autowired
private ICommunityLocationV1InnerServiceSMO communityLocationV1InnerServiceSMOImpl;
@@ -75,62 +76,66 @@
Assert.hasKeyAndValue(reqJson, "direction", "蹇呭～锛岃閫夋嫨璁惧鏂瑰悜");
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);
-
}
@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);
int flag = machineV1InnerServiceSMOImpl.saveMachine(machinePo);
-
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
-
- dealMachineAttr(reqJson);
-
+ dealMachineAttr(reqJson, machinePo);
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
- private void dealMachineAttr(JSONObject paramObj) {
-
+ private void dealMachineAttr(JSONObject paramObj, MachinePo machinePo) {
if (!paramObj.containsKey("attrs")) {
return;
}
-
JSONArray attrs = paramObj.getJSONArray("attrs");
if (attrs.size() < 1) {
return;
}
-
MachineAttrPo attr = null;
int flag = 0;
for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
attr = BeanConvertUtil.covertBean(attrs.getJSONObject(attrIndex), MachineAttrPo.class);
attr.setCommunityId(paramObj.getString("communityId"));
- attr.setMachineId(paramObj.getString("machineId"));
+ attr.setMachineId(machinePo.getMachineId());
attr.setAttrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
flag = machineAttrInnerServiceSMOImpl.saveMachineAttrs(attr);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
}
-
}
}
--
Gitblit v1.8.0