潘钊 / control_service_data_Interface · Commits

Commit 1b93cb1d954373fdb32d13e33bd75a947cd46a23

Authored by 王通
1 parent aa681ecd
build: skipped

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

Inline Side-by-side
Showing 2 changed files with 14 additions and 0 deletions
src/main/java/com/bsth/entity/ScheduleRealInfoVo.java
  View file @1b93cb1
... ... @@ -185,6 +185,8 @@ public class ScheduleRealInfoVo implements Serializable{
185 185 @JsonIgnore
186 186 private Integer lpChange;
187 187  
  188 + private String carPlate;
  189 +
188 190 @Override
189 191 public int hashCode() {
190 192 return (this.id + this.scheduleDateStr + this.xlBm + this.fcsj).hashCode();
... ... @@ -650,4 +652,12 @@ public class ScheduleRealInfoVo implements Serializable{
650 652 this.zdsjActualTime = t;
651 653 this.zdsjActual = fmtHHmm.print(t);
652 654 }
  655 +
  656 + public String getCarPlate() {
  657 + return carPlate;
  658 + }
  659 +
  660 + public void setCarPlate(String carPlate) {
  661 + this.carPlate = carPlate;
  662 + }
653 663 }
... ...
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
  View file @1b93cb1
... ... @@ -10,6 +10,8 @@ import com.bsth.entity.ScheduleRealInfo;
10 10 import com.bsth.entity.ScheduleRealInfoVo;
11 11 import com.bsth.redis.ScheduleRedisService;
12 12 import com.bsth.repository.ScheduleRealInfoRepository;
  13 +import com.bsth.server_rs.base_info.car.Car;
  14 +import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
13 15 import com.bsth.server_rs.base_info.line.Line;
14 16 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
15 17 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
... ... @@ -304,6 +306,8 @@ public class ScheduleRealService implements InitializingBean {
304 306 for (ScheduleRealInfo sch : scheduleRealInfos) {
305 307 ScheduleRealInfoVo scheduleRealInfoVo = new ScheduleRealInfoVo();
306 308 BeanUtils.copyProperties(sch, scheduleRealInfoVo);
  309 + Car car = CarBufferData.findOne(scheduleRealInfoVo.getClZbh());
  310 + scheduleRealInfoVo.setCarPlate(car == null ? "" : car.getCarPlate());
307 311 scheduleRealInfoVos.add(scheduleRealInfoVo);
308 312 }
309 313 Map<String, Object> data = new HashMap<>();
... ...