Lianxun_Java.git

			@@ -2,18 +2,19 @@

			import com.alibaba.fastjson.JSONObject;
			import com.java110.api.bmo.machineTranslate.IOwnerCarMachineTranslateBMO;
			import com.java110.api.listener.machineTranslate.MachineQueryUserInfoListener;
			import com.java110.dto.machine.CarResultDto;
			import com.java110.dto.machine.MachineTranslateDto;
			import com.java110.dto.machine.MachineUserResultDto;
			import com.java110.dto.owner.OwnerCarDto;
			import com.java110.dto.owner.OwnerDto;
			import com.java110.dto.parking.ParkingSpaceDto;
			import com.java110.intf.common.IFileInnerServiceSMO;
			import com.java110.intf.common.IFileRelInnerServiceSMO;
			import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
			import com.java110.intf.community.ICommunityInnerServiceSMO;
			import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
			import com.java110.intf.user.IOwnerCarInnerServiceSMO;
			import com.java110.utils.util.DateUtil;
			import com.java110.intf.user.IOwnerInnerServiceSMO;
			import com.java110.utils.util.StringUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.http.ResponseEntity;
			import org.springframework.stereotype.Service;

			import java.util.List;
			@@ -33,7 +34,7 @@
			private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

			@Autowired
			private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
			private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

			@Autowired
			private IFileInnerServiceSMO fileInnerServiceSMOImpl;
			@@ -44,8 +45,11 @@
			@Autowired
			private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;

			@Autowired
			private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;

			@Override
			public MachineUserResultDto getInfo(JSONObject reqJson) {
			public CarResultDto getInfo(JSONObject reqJson) {

			String communityId = reqJson.getString("communityId");
			OwnerCarDto ownerCarDto = new OwnerCarDto();
			@@ -55,20 +59,45 @@


			ownerCarDto = ownerCarDtos.get(0);
			OwnerDto ownerDto = new OwnerDto();
			ownerDto.setMemberId(ownerCarDto.getOwnerId());
			ownerDto.setCommunityId(ownerCarDto.getCommunityId());
			List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
			String ownerName = "未知";
			String phone = "18911111111";
			if (ownerDtos != null && ownerDtos.size() == 1) {
			ownerName = ownerDtos.get(0).getName();
			phone = ownerDtos.get(0).getLink();
			}

			MachineUserResultDto machineUserResultDto = new MachineUserResultDto();
			machineUserResultDto.setUserid(ownerCarDto.getCarId());
			machineUserResultDto.setGroupid(communityId);
			machineUserResultDto.setGroup(reqJson.getString("communityName"));
			machineUserResultDto.setName(ownerCarDto.getCarNum());
			machineUserResultDto.setFaceBase64("");
			machineUserResultDto.setIdNumber("");
			machineUserResultDto.setStartTime(ownerCarDto.getStartTime().getTime()+"");
			machineUserResultDto.setEndTime(ownerCarDto.getEndTime().getTime()+"");
			CarResultDto carResultDto = new CarResultDto();
			if (!StringUtil.isEmpty(ownerCarDto.getPsId())) {
			ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
			parkingSpaceDto.setPsId(ownerCarDto.getPsId());
			parkingSpaceDto.setCommunityId(communityId);
			List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);

			machineUserResultDto.setRemarks("HC小区管理系统");
			machineUserResultDto.setReserved(ownerCarDto.getCarId());
			machineUserResultDto.setUserType(MachineQueryUserInfoListener.TYPE_OWNER_CAR);
			if (parkingSpaceDtos != null && parkingSpaceDtos.size() > 0) {
			carResultDto.setPaId(parkingSpaceDtos.get(0).getPaId());
			carResultDto.setAreaNum(parkingSpaceDtos.get(0).getAreaNum());
			carResultDto.setNum(parkingSpaceDtos.get(0).getNum());
			}
			}


			carResultDto.setCarId(ownerCarDto.getCarId());
			carResultDto.setCommunityId(communityId);
			carResultDto.setCommunityName(reqJson.getString("communityName"));
			carResultDto.setCarNum(ownerCarDto.getCarNum());
			carResultDto.setName(ownerName);
			carResultDto.setPhone(phone);
			carResultDto.setCarBrand(ownerCarDto.getCarBrand());
			carResultDto.setCarColor(ownerCarDto.getCarColor());
			carResultDto.setStartTime(ownerCarDto.getStartTime().getTime() + "");
			carResultDto.setEndTime(ownerCarDto.getEndTime().getTime() + "");
			carResultDto.setCarType(ownerCarDto.getCarType());

			carResultDto.setRemarks("HC小区管理系统道闸同步");

			//查询业主是否有欠费

			@@ -80,6 +109,6 @@
			tmpMtDto.setState("20000");
			machineTranslateInnerServiceSMOImpl.updateMachineTranslateState(tmpMtDto);

			return machineUserResultDto;
			return carResultDto;
			}
			}