Commit 8cdd467a authored by 喻训浩's avatar 喻训浩

fix: 测试数据

parent 27b16cdf
......@@ -7,6 +7,8 @@ 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.enums.BusType;
import net.vtstar.zhongtong.avi.monitoring.domain.enums.DateType;
import net.vtstar.zhongtong.avi.monitoring.domain.enums.ProductionType;
import net.vtstar.zhongtong.avi.monitoring.domain.enums.StationState;
import net.vtstar.zhongtong.avi.monitoring.domain.vo.CarStatisticsVO;
......@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -27,7 +30,7 @@ import java.util.Map;
public class AreaController {
@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")
"整体区域:0\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) {
List<PaintshopArea> areas = new ArrayList<>();
......@@ -58,7 +61,22 @@ public class AreaController {
@ApiOperation(value = "查询车间各区域进车及交车数量", response = CarStatisticsVO.class, responseContainer = "List")
@GetMapping("/bus/statistics")
private Return getRealtimeData() {
return Return.success();
ArrayList<CarStatisticsVO> vos = new ArrayList<>();
CarStatisticsVO carStatisticsVO = new CarStatisticsVO();
carStatisticsVO.setAreaNo("1");
carStatisticsVO.setBusType(BusType.IN);
carStatisticsVO.setDateType(DateType.YESTERDAY);
carStatisticsVO.setSize(new BigDecimal(20));
CarStatisticsVO carStatisticsVO2 = new CarStatisticsVO();
carStatisticsVO2.setAreaNo("2");
carStatisticsVO2.setBusType(BusType.OUT);
carStatisticsVO2.setDateType(DateType.TODAY);
carStatisticsVO2.setSize(new BigDecimal(20));
vos.add(carStatisticsVO);
vos.add(carStatisticsVO2);
return Return.success(vos);
}
@ApiOperation(value = "根据工单号及订单号定位车体当前位置", response = PaintshopArea.class, responseContainer = "List")
......
......@@ -14,8 +14,8 @@ public class CarStatisticsVO {
private Long id;
@ApiModelProperty(value = "区域")
private String areaName;
@ApiModelProperty(value = "区域编号")
private String areaNo;
@ApiModelProperty("日期类型:TODAY(今日),YESTERDAY(昨日)")
private DateType dateType;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment