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 | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 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 0dc5995..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
@@ -15,22 +15,31 @@
*/
package com.java110.common.cmd.machine;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.community.CommunityLocationDto;
+import com.java110.dto.machine.MachineDto;
+import com.java110.intf.common.IMachineAttrInnerServiceSMO;
import com.java110.intf.common.IMachineV1InnerServiceSMO;
+import com.java110.intf.community.ICommunityLocationV1InnerServiceSMO;
+import com.java110.po.machine.MachineAttrPo;
import com.java110.po.machine.MachinePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -43,40 +52,90 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "machine.saveMachine")
-public class SaveMachineCmd extends AbstractServiceCmdListener {
+public class SaveMachineCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger( SaveMachineCmd.class );
+ private static Logger logger = LoggerFactory.getLogger(SaveMachineCmd.class);
public static final String CODE_PREFIX_ID = "10";
@Autowired
private IMachineV1InnerServiceSMO machineV1InnerServiceSMOImpl;
+ @Autowired
+ private ICommunityLocationV1InnerServiceSMO communityLocationV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMachineAttrInnerServiceSMO machineAttrInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue( reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈machineCode" );
- Assert.hasKeyAndValue( reqJson, "machineVersion", "璇锋眰鎶ユ枃涓湭鍖呭惈machineVersion" );
- Assert.hasKeyAndValue( reqJson, "machineTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈machineTypeCd" );
- Assert.hasKeyAndValue( reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId" );
- Assert.hasKeyAndValue( reqJson, "machineName", "璇锋眰鎶ユ枃涓湭鍖呭惈machineName" );
- Assert.hasKeyAndValue( reqJson, "authCode", "璇锋眰鎶ユ枃涓湭鍖呭惈authCode" );
- Assert.hasKeyAndValue( reqJson, "direction", "璇锋眰鎶ユ枃涓湭鍖呭惈direction" );
- Assert.hasKeyAndValue( reqJson, "typeId", "璇锋眰鎶ユ枃涓湭鍖呭惈typeId" );
-
+ Assert.hasKeyAndValue(reqJson, "machineCode", "蹇呭～锛岃濉啓璁惧缂栫爜");
+ Assert.hasKeyAndValue(reqJson, "machineVersion", "蹇呭～锛岃濉啓璁惧鐗堟湰鍙�");
+ Assert.hasKeyAndValue(reqJson, "machineName", "蹇呭～锛岃濉啓璁惧鍚嶇О");
+ Assert.hasKeyAndValue(reqJson, "machineTypeCd", "蹇呭～锛岃閫夋嫨璁惧绫诲瀷");
+ 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 {
-
- MachinePo machinePo = BeanConvertUtil.covertBean( reqJson, MachinePo.class );
- machinePo.setMachineId( GenerateCodeFactory.getGeneratorId( CODE_PREFIX_ID ) );
- int flag = machineV1InnerServiceSMOImpl.saveMachine( machinePo );
-
- if (flag < 1) {
- throw new CmdException( "淇濆瓨鏁版嵁澶辫触" );
+ MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
+ 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, machinePo);
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ }
- cmdDataFlowContext.setResponseEntity( ResultVo.success() );
+ 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(machinePo.getMachineId());
+ attr.setAttrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ flag = machineAttrInnerServiceSMOImpl.saveMachineAttrs(attr);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ }
+ }
}
}
--
Gitblit v1.8.0