进度管理
This commit is contained in:
@ -248,17 +248,18 @@ public class BigScreenWebSocketServer {
|
||||
//先获取左边坐标得到map
|
||||
Map<String, String> infoData = busAttendanceService.getRyglOnlineUserInfoData(projectId);
|
||||
//获取右边数据
|
||||
busAttendanceService.getAttendanceInfo(projectId, Long.valueOf(timeType) , infoData);
|
||||
busAttendanceService.getAttendanceInfo(projectId, Long.valueOf(timeType), infoData);
|
||||
//返回数据
|
||||
maps.add(infoData);
|
||||
break;
|
||||
case 3:
|
||||
// 质安管理
|
||||
jxzagl(projectId,message,maps);
|
||||
jxzagl(projectId, message, maps);
|
||||
|
||||
break;
|
||||
case 4:
|
||||
// 进度管理大屏
|
||||
getProgressBigScreenData(maps, projectId);
|
||||
break;
|
||||
case 5:
|
||||
//物资管理大屏
|
||||
@ -273,7 +274,7 @@ public class BigScreenWebSocketServer {
|
||||
|
||||
try {
|
||||
message = JSONUtil.toJsonStr(maps);
|
||||
session.getBasicRemote().sendText( message);
|
||||
session.getBasicRemote().sendText(message);
|
||||
} catch (IOException e) {
|
||||
log.error("📤 回复会话[{}]失败:{}", session.getId(), e.getMessage());
|
||||
}
|
||||
@ -392,7 +393,7 @@ public class BigScreenWebSocketServer {
|
||||
/**
|
||||
* 查询大屏-质量管理-接收消息
|
||||
*/
|
||||
private void jxzagl(Long projectId, String message,List<Map<String, String>> maps) {
|
||||
private void jxzagl(Long projectId, String message, List<Map<String, String>> maps) {
|
||||
DpzaglService dpzaglService = SpringUtils.getBean(DpzaglService.class);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@ -400,7 +401,8 @@ public class BigScreenWebSocketServer {
|
||||
try {
|
||||
Map<String, String> dateMap = objectMapper.readValue(
|
||||
message,
|
||||
new TypeReference<Map<String, String>>() {}
|
||||
new TypeReference<Map<String, String>>() {
|
||||
}
|
||||
);
|
||||
|
||||
// 3. 获取数据(两种方式)
|
||||
@ -410,15 +412,13 @@ public class BigScreenWebSocketServer {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.CHINA);
|
||||
|
||||
DpznglBo dpznglBo = new DpznglBo();
|
||||
if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)){
|
||||
if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) {
|
||||
dpznglBo.setStartDate(LocalDate.parse(startDate, formatter));
|
||||
dpznglBo.setEndDate(LocalDate.parse(endDate, formatter));
|
||||
|
||||
}
|
||||
dpznglBo.setProjectId(projectId);
|
||||
|
||||
|
||||
|
||||
// 查询大屏-质安管理-安全员分布情况
|
||||
|
||||
List<DpznglAqyVo> dpznglAqyVos = dpzaglService.listByAqy(dpznglBo);
|
||||
@ -465,11 +465,11 @@ public class BigScreenWebSocketServer {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.CHINA);
|
||||
|
||||
|
||||
if (startDate != null && startDate.size() > 0){
|
||||
if (startDate != null && startDate.size() > 0) {
|
||||
String first = startDate.getFirst();
|
||||
dpznglBo.setStartDate(LocalDate.parse(first, formatter));
|
||||
}
|
||||
if (endDate != null && endDate.size() > 0){
|
||||
if (endDate != null && endDate.size() > 0) {
|
||||
String first = endDate.getFirst();
|
||||
dpznglBo.setEndDate(LocalDate.parse(first, formatter));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user