fix: 数据清洗与运行时间计算分离

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/PaintshopStation.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import net.vtstar.user.search.JoinColumn;
 import net.vtstar.user.search.Search;
+import net.vtstar.zhongtong.avi.monitoring.domain.enums.StationState;
 import org.hibernate.validator.constraints.Length;
 
 import javax.persistence.Column;
@@ -59,7 +60,7 @@ public class PaintshopStation {
 
     @ApiModelProperty(notes = "状态")
     @Column(name = "state")
-    private String state;
+    private StationState state;
 
     @ApiModelProperty(notes = "滑撬ID")
     @Column(name = "skid_id")

src/main/java/net/vtstar/zhongtong/avi/equipment/job/CleanStatusDataJob.java

@@ -50,7 +50,7 @@ public class CleanStatusDataJob extends QuartzJobBean {
             if (CollectionUtils.isEmpty(dataList)) {
                 continue;
             }
-            //往数据库插入设备监控数据
+            //插入设备监控数据
             equipmentDataMapper.insertList(dataList);
             equipDataService.updateLastStatus(dataList.get(dataList.size() - 1));
 

src/main/java/net/vtstar/zhongtong/avi/monitoring/controller/AreaController.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import net.vtstar.utils.domain.Return;
 import net.vtstar.zhongtong.avi.equipment.domain.PaintshopArea;
-import net.vtstar.zhongtong.avi.equipment.domain.PaintshopStation;
 import net.vtstar.zhongtong.avi.monitoring.domain.Bus;
 import net.vtstar.zhongtong.avi.monitoring.domain.vo.CarStatisticsVO;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-
 @Slf4j
 @Api(description = "avi区域实时监控模块相关")
 @RestController
@@ -34,7 +31,7 @@ public class AreaController {
         return Return.success();
     }
 
-    @ApiOperation(value = "根据工单号及订单号定位车体当前位置", response = PaintshopStation.class, responseContainer = "List")
+    @ApiOperation(value = "根据工单号及订单号定位车体当前位置", response = PaintshopArea.class, responseContainer = "List")
     @GetMapping("/currentPosition/orderNo/busNo")
     private Return getPositionByOrderAndNo(@RequestParam("orderNo") String orderNo, @RequestParam("workOrderNo") String workOrderNo) {
         return Return.success();

src/main/java/net/vtstar/zhongtong/avi/monitoring/domain/enums/StationState.java

+package net.vtstar.zhongtong.avi.monitoring.domain.enums;
+
+public enum StationState {
+
+    /**
+     * 占用
+     */
+    USE,
+    /**
+     * 空闲
+     */
+    FREE;
+}