| | |
|---|
| | | if (outGlass != null) { |
|---|
| | | jsonObject.append("overGlass", overGlass); |
|---|
| | | } |
|---|
| | | //当前钢化工程的拿走数据 |
|---|
| | | LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>(); |
|---|
| | | queryWrapper.select(TemperingGlassInfo::getEngineerId) |
|---|
| | | .lt(TemperingGlassInfo::getState, Const.TEMPERING_END) |
|---|
| | | .groupBy(TemperingGlassInfo::getEngineerId); |
|---|
| | | |
|---|
| | | List<String> engineerIds = temperingAgoService.list(queryWrapper) |
|---|
| | | .stream() |
|---|
| | | .map(TemperingGlassInfo::getEngineerId) |
|---|
| | | .distinct() |
|---|
| | | .collect(Collectors.toList()); |
|---|
| | | |
|---|
| | | List<Damage> temperingTakeGlassInfos = damageService.list( |
|---|
| | | new LambdaQueryWrapper<Damage>() |
|---|
| | | .in(Damage::getEngineerId, engineerIds) |
|---|
| | | .eq(Damage::getType, Const.GLASS_STATE_TAKE) |
|---|
| | | .orderByAsc(Damage::getId) |
|---|
| | | ); |
|---|
| | | |
|---|
| | | |
|---|
| | | jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos); |
|---|
| | | |
|---|
| | | ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass"); |
|---|
| | | if (sendwServer != null) { |
|---|
