Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-02-21 e23023b93f34286f5a807b0b85e9a0619a297ed7

 service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java

@@ -25,6 +25,7 @@
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;
@@ -75,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);

@@ -83,30 +92,35 @@
    @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);
        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;
@@ -122,7 +136,7 @@
        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) {