1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug

xiaogang

2023-03-20 6e13e0fa577df5511157a7841617106bd2f5c0b2

 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,25 +76,20 @@
        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);

        if (!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))) {
            CommunityLocationDto communityLocationDto = new CommunityLocationDto();
            communityLocationDto.setCommunityId(reqJson.getString("communityId"));
@@ -105,32 +101,25 @@
            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());
    }

    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++) {
@@ -143,6 +132,5 @@
                throw new CmdException("保存数据失败");
            }
        }

    }
}