Commit 7596a614 authored by 喻训浩's avatar 喻训浩

fix: 测试数据

parent 855dd6bd
...@@ -36,7 +36,7 @@ public class EquipmentController { ...@@ -36,7 +36,7 @@ public class EquipmentController {
"") "")
@PostMapping(value = "/realTime/data") @PostMapping(value = "/realTime/data")
private Return getRealTimeData(@RequestBody SearchVo pageFilter) { private Return getRealTimeData(@RequestBody SearchVo pageFilter) {
Object realTimeData = equipmentService.findRealTimeData(); Object realTimeData = equipmentService.findRealTimeData(pageFilter);
List<Map<String, Object>> data = (List<Map<String, Object>>) realTimeData; List<Map<String, Object>> data = (List<Map<String, Object>>) realTimeData;
return Return.success(new PageInfo<>(data)); return Return.success(new PageInfo<>(data));
} }
......
package net.vtstar.zhongtong.avi.equipment.service; package net.vtstar.zhongtong.avi.equipment.service;
import net.vtstar.user.search.controller.vo.SearchVo;
import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine; import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine;
import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.BorderStyle;
...@@ -9,6 +10,7 @@ import org.apache.poi.xssf.usermodel.XSSFFont; ...@@ -9,6 +10,7 @@ import org.apache.poi.xssf.usermodel.XSSFFont;
import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
...@@ -23,7 +25,10 @@ import java.util.List; ...@@ -23,7 +25,10 @@ import java.util.List;
@Service @Service
public class EquipmentService { public class EquipmentService {
public <T> T findRealTimeData() { @Autowired
private EquipmentService equipmentService;
public <T> T findRealTimeData(SearchVo pageFilter) {
List<LaserCuttingMachine> ma = new ArrayList<>(); List<LaserCuttingMachine> ma = new ArrayList<>();
LaserCuttingMachine machine = new LaserCuttingMachine(); LaserCuttingMachine machine = new LaserCuttingMachine();
machine.setBeginTime(new Date()); machine.setBeginTime(new Date());
......
...@@ -35,26 +35,53 @@ public class AreaController { ...@@ -35,26 +35,53 @@ public class AreaController {
private Return getAreaInfo(@RequestParam(value = "areaNo",required = false) String areaNo) { private Return getAreaInfo(@RequestParam(value = "areaNo",required = false) String areaNo) {
List<PaintshopArea> areas = new ArrayList<>(); List<PaintshopArea> areas = new ArrayList<>();
PaintshopArea area = new PaintshopArea(); PaintshopArea area = new PaintshopArea();
area.setCode("1"); area.setCode("2");
area.setName("钣金"); area.setName("电泳");
area.setOnlineNum("44"); area.setOnlineNum("44");
Map<String, PaintshopStation> stationMap = new HashMap<>(); Map<String, PaintshopStation> stationMap = new HashMap<>();
Map<String, PaintshopStation> stationMap2 = new HashMap<>();
Map<String, PaintshopStation> stationMap3 = new HashMap<>();
for (int i = 0; i < 9; i++) {
PaintshopStation station = new PaintshopStation(); PaintshopStation station = new PaintshopStation();
station.setBusNo("aaa"); station.setBusNo("No" + i);
station.setKeyStation(true); station.setKeyStation(true);
station.setCode("HDG1-4"); station.setCode("HDG1-4" + i);
station.setState(StationState.USE); station.setState(StationState.USE);
station.setBusType(ProductionType.OWN); station.setBusType(ProductionType.OWN);
stationMap.put("HDG1-4",station); stationMap.put("HDG1-4" + i,station);
PaintshopStation station2 = new PaintshopStation(); }
station2.setBusNo("bbb"); PaintshopArea area2 = new PaintshopArea();
station2.setKeyStation(false); area2.setCode("1");
station2.setBusType(ProductionType.OTHER); area2.setName("钣金");
station2.setState(StationState.FREE); area2.setOnlineNum("44");
station2.setCode("HDG1-3"); for (int i = 0; i < 9; i++) {
stationMap.put("HDG1-3",station2); PaintshopStation station = new PaintshopStation();
station.setBusNo("No" + i);
station.setKeyStation(true);
station.setCode("HDG1-1" + i);
station.setState(StationState.USE);
station.setBusType(ProductionType.OWN);
stationMap2.put("HDG1-1" + i,station);
}
PaintshopArea area3 = new PaintshopArea();
area3.setCode("6");
area3.setName("喷涂");
area3.setOnlineNum("44");
for (int i = 0; i < 9; i++) {
PaintshopStation station = new PaintshopStation();
station.setBusNo("No" + i);
station.setKeyStation(true);
station.setCode("HDG1-19" + i);
station.setState(StationState.USE);
station.setBusType(ProductionType.OWN);
stationMap3.put("HDG1-19" + i,station);
}
area.setStationMap(stationMap); area.setStationMap(stationMap);
area2.setStationMap(stationMap2);
area3.setStationMap(stationMap3);
areas.add(area); areas.add(area);
areas.add(area2);
areas.add(area3);
return Return.success(areas); return Return.success(areas);
} }
......
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