1.加入kafka传电子路单至数据中台

王通
1 parent aa681ecd
Showing 2 changed files with 14 additions and 0 deletions
src/main/java/com/bsth/entity/ScheduleRealInfoVo.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
@@ -185,6 +185,8 @@ public class ScheduleRealInfoVo implements Serializable{
 	@JsonIgnore
 	private Integer lpChange;
+	private String carPlate;
+
 	@Override
 	public int hashCode() {
 		return (this.id + this.scheduleDateStr + this.xlBm + this.fcsj).hashCode();
@@ -650,4 +652,12 @@ public class ScheduleRealInfoVo implements Serializable{
 		this.zdsjActualTime = t;
 		this.zdsjActual = fmtHHmm.print(t);
 	}
+
+	public String getCarPlate() {
+		return carPlate;
+	}
+
+	public void setCarPlate(String carPlate) {
+		this.carPlate = carPlate;
+	}
 }
@@ -10,6 +10,8 @@ import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.entity.ScheduleRealInfoVo;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.repository.ScheduleRealInfoRepository;
+import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
 import com.bsth.server_rs.base_info.line.Line;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
@@ -304,6 +306,8 @@ public class ScheduleRealService implements InitializingBean {
                     for (ScheduleRealInfo sch : scheduleRealInfos) {
                         ScheduleRealInfoVo scheduleRealInfoVo = new ScheduleRealInfoVo();
                         BeanUtils.copyProperties(sch, scheduleRealInfoVo);
+                        Car car = CarBufferData.findOne(scheduleRealInfoVo.getClZbh());
+                        scheduleRealInfoVo.setCarPlate(car == null ? "" : car.getCarPlate());
                         scheduleRealInfoVos.add(scheduleRealInfoVo);
                     }
                     Map<String, Object> data = new HashMap<>();