区域.车道接口

src/main/java/net/vtstar/zhongtong/avi/equipment/controller/BasicInfoController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import net.vtstar.user.search.controller.vo.SearchVo;
+import net.vtstar.utils.asserts.ParamAssert;
 import net.vtstar.utils.domain.Return;
 import net.vtstar.zhongtong.avi.equipment.domain.EquipInfo;
 import net.vtstar.zhongtong.avi.equipment.domain.PaintshopStation;
@@ -111,4 +112,23 @@ public class BasicInfoController {
         basicInfoService.deleteStationById(stationId);
         return Return.success();
     }
+
+    @ApiOperation(value = "查询所有区域", notes = "字段含义：\n{\n" +
+            "  \"name\": \"区域名称，字符串类型\",\n" +
+            "  \"onlineNum\": \"在线数量，INT\",\n" +
+            "}")
+    @GetMapping("/area")
+    public Return getPaintshopArea() {
+        return Return.success(basicInfoService.getPaintshopArea());
+    }
+
+    @ApiOperation(value = "查询指定区域下的所有车道", notes = "字段含义：\n{\n" +
+            "  \"name\": \"车道名称，字符串类型\",\n" +
+            "  \"code\": \"车道编号，字符串类型\",\n" +
+            "}")
+    @GetMapping("/lane/{areaId}")
+    public Return getPaintshopLane(@PathVariable("areaId") Long areaId) {
+        ParamAssert.notNull(areaId, "区域ID为NULL!");
+        return Return.success(basicInfoService.getPaintshopLane(areaId));
+    }
 }

src/main/java/net/vtstar/zhongtong/avi/equipment/service/BasicInfoService.java

@@ -13,6 +13,8 @@ import net.vtstar.zhongtong.avi.equipment.domain.PaintshopArea;
 import net.vtstar.zhongtong.avi.equipment.domain.PaintshopLane;
 import net.vtstar.zhongtong.avi.equipment.domain.PaintshopStation;
 import net.vtstar.zhongtong.avi.equipment.mapper.BasicInfoMapper;
+import net.vtstar.zhongtong.avi.equipment.mapper.PaintshopAreaMapper;
+import net.vtstar.zhongtong.avi.equipment.mapper.PaintshopLaneMapper;
 import net.vtstar.zhongtong.avi.equipment.mapper.PaintshopStationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,12 @@ public class BasicInfoService {
     @Autowired
     private PaintshopStationMapper stationMapper;
 
+    @Autowired
+    private PaintshopAreaMapper paintshopAreaMapper;
+
+    @Autowired
+    private PaintshopLaneMapper paintshopLaneMapper;
+
     /**
      * 分页查询设备
      */
@@ -190,4 +198,14 @@ public class BasicInfoService {
             return station;
         }
     }
+
+    public List<PaintshopArea> getPaintshopArea() {
+       return paintshopAreaMapper.findList(new WhereFilter(), PaintshopArea.class);
+    }
+
+    public List<PaintshopLane> getPaintshopLane(Long areaId) {
+        return paintshopLaneMapper.findList(new WhereFilter(){{
+            addFilter("area_id", Operation.EQUAL, areaId);
+        }}, PaintshopLane.class);
+    }
 }