代码优化

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckWaitVO.java

 package com.clx.performance.vo.pc.collect;
 
+import com.alibaba.fastjson.JSON;
 import com.clx.performance.enums.collect.CollectTruckWaitEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
 * @Author: aiqinguo
@@ -57,14 +62,31 @@ public class CollectTruckWaitVO {
         return CollectTruckWaitEnum.waitType.getByCode(waitType).get().getMsg();
     }
 
-    @ApiModelProperty(value = "预计站内等待时长", example = "")
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站内等待时长", example = "", hidden = true)
     private BigDecimal stationInTime;
-    @ApiModelProperty(value = "预计站内等待时长图片", example = "")
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站内等待时长图片", example = "", hidden = true)
     private String stationInImage;
-    @ApiModelProperty(value = "预计站外等待时长", example = "")
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站外等待时长", example = "", hidden = true)
     private BigDecimal stationOutTime;
-    @ApiModelProperty(value = "预计站外等待时长图片", example = "")
+    @JsonIgnore
+    @ApiModelProperty(value = "预计站外等待时长图片", example = "", hidden = true)
     private String stationOutImage;
+
+    @ApiModelProperty(value = "预计等待时长", example = "")
+    private BigDecimal stationTime;
+    public BigDecimal getStationTime() {
+        return stationInTime;
+    }
+
+    @ApiModelProperty(value = "预计站内等待时长图片", example = "")
+    private List<String> stationInImageList;
+    public List<String> getStationInImageList() {
+        return StringUtils.isEmpty(stationOutImage)? new ArrayList<>() : JSON.parseArray(stationInImage, String.class);
+    }
+
     @ApiModelProperty(value = "上报时间", example = "")
     private String reportTime;
     @ApiModelProperty(value = "审核状态：0待审核 1已审核", example = "")

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectWaitReportServiceImpl.java

@@ -107,8 +107,8 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
         collectTruckWait.setReportType(CollectTruckWait.ReportType.UNLOAD.getCode());
         collectTruckWait.setWaitType(param.getWaitType());
 
-        collectTruckWait.setStationOutTime(param.getStationOutTime());
-        collectTruckWait.setStationOutImage(param.getStationOutImageList()==null? null:JSON.toJSONString(param.getStationOutImageList()));
+        collectTruckWait.setStationInTime(param.getStationOutTime());
+        collectTruckWait.setStationInImage(param.getStationOutImageList()==null? null:JSON.toJSONString(param.getStationOutImageList()));
 
         collectTruckWait.setReportTime(LocalDateTime.now());
         collectTruckWait.setCreateTime(collectTruckWait.getReportTime());