Commit ad37167b authored by 喻训浩's avatar 喻训浩

fix:searchCode定义

parent b1b9780a
...@@ -9,12 +9,11 @@ import net.vtstar.utils.domain.Return; ...@@ -9,12 +9,11 @@ import net.vtstar.utils.domain.Return;
import net.vtstar.zhongtong.avi.equipment.service.EquipmentService; import net.vtstar.zhongtong.avi.equipment.service.EquipmentService;
import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine; import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@Api(description = "设备模块") @Api(description = "设备模块")
...@@ -25,14 +24,14 @@ public class EquipmentController { ...@@ -25,14 +24,14 @@ public class EquipmentController {
@Autowired @Autowired
private EquipmentService equipmentService; private EquipmentService equipmentService;
@ApiOperation(value = "获取设备实时监控数据(分页)",notes = "各车间对应code:\r\n" + @ApiOperation(value = "获取设备实时监控数据(分页)", notes = "各车间对应code:\r\n" +
"制件车间: PARTS\r\n焊装车间: WELDING\r\n涂装车间: PAINTING\r\n" + "制件车间: PARTS\r\n焊装车间: WELDING\r\n涂装车间: PAINTING\r\n" +
"底盘车间: CHASSIS\r\n总装车间: ASSEMBLY\r\n试交车间: TRIAL\r\n" + "底盘车间: CHASSIS\r\n总装车间: ASSEMBLY\r\n试交车间: TRIAL\r\n" +
"") "")
@GetMapping(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();
ArrayList<LaserCuttingMachine> data = (ArrayList<LaserCuttingMachine>) realTimeData; List<Map<String, Object>> data = (List<Map<String, Object>>) realTimeData;
return Return.success(new PageInfo<>(data)); return Return.success(new PageInfo<>(data));
} }
} }
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