fix: BUG修改

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

@@ -9,6 +9,7 @@ import javax.persistence.Column;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: xiadongwei
@@ -30,5 +31,8 @@ public class PaintshopArea {
     @Column(name = "online_num")
     private String onlineNum;
 
+    private Map<String,PaintshopStation> stationMap;
+
+    @ApiModelProperty(notes = "下属区域",hidden = true)
     private List<PaintshopLane> laneList;
 }

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

@@ -13,13 +13,16 @@ 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
 @RequestMapping("/area")
 public class AreaController {
 
-    @ApiOperation(value = "根据区域编号查询区域实时信息", response = PaintshopArea.class, responseContainer = "List")
+    @ApiOperation(value = "根据区域编号查询区域实时信息", response = PaintshopArea.class, responseContainer = "List",notes = "区域编号：\r\n" +
+            "钣金：1\r\n电泳：2\r\n密封防腐：3\r\n腻子：4\r\n中涂：5\r\n面/色漆：6\r\n成品：7")
     @GetMapping("/areaInfo/realTime")
     private Return getAreaInfo(@RequestParam(value = "areaNo",required = false) String areaNo) {
         return Return.success();
@@ -33,7 +36,7 @@ public class AreaController {
 
     @ApiOperation(value = "根据工单号及车身号定位车体当前位置", response = PaintshopStation.class, responseContainer = "List")
     @GetMapping("/currentPosition/orderNo/busNo")
-    private Return getPositionByOrderAndNo(@RequestParam("orderNo") String orderNo, @RequestParam("busNo") String busNo) {
+    private Return getPositionByOrderAndNo(@RequestParam("orderNo") String orderNo, @RequestParam("workOrderNo") String workOrderNo) {
         return Return.success();
     }