优化 考勤同步功能

java110

2022-08-04 f89d6890ff8e30eaa165c6a45f0696789d24d57b

 service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.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;
@@ -77,7 +78,6 @@
        Assert.hasKeyAndValue(reqJson, "direction", "必填，请选择设备方向");
        Assert.hasKeyAndValue(reqJson, "authCode", "必填，请填写鉴权编码");
        Assert.hasKeyAndValue(reqJson, "locationTypeCd", "必填，请选择位置类型");
        Assert.hasKeyAndValue(reqJson, "locationObjId", "必填，请填写位置对象ID");

        Assert.judgeAttrValue(reqJson);

@@ -86,14 +86,16 @@
    @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());
        }

        int flag = machineV1InnerServiceSMOImpl.updateMachine(machinePo);
        if (flag < 1) {