优化 考勤同步功能

java110

2022-08-04 f89d6890ff8e30eaa165c6a45f0696789d24d57b

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

@@ -84,16 +84,20 @@
    @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);