提交 ad37167b 编辑于 作者: 喻训浩's avatar 喻训浩
浏览文件

fix:searchCode定义

上级 b1b9780a

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

+7 −8
原始行号 原始行 差异行号 差异行
@@ -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 = "设备模块")
@@ -29,10 +28,10 @@ public class EquipmentController { 
            "制件车间: 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));

    }

    }

}
 
}