diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/DpznglAqyVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/DpznglAqyVo.java index 55dfb928..849b3962 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/DpznglAqyVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/DpznglAqyVo.java @@ -14,7 +14,7 @@ public class DpznglAqyVo implements Serializable { private Long userId; - @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "userId") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "userId") private String userName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java index 3f45b224..f5c02f99 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java @@ -142,7 +142,7 @@ public class DpzaglServiceImpl implements DpzaglService { if (busProjectPunchranges == null || busProjectPunchranges.size() == 0){ return; } - +//判断是否在岗 for (DpznglAqyVo dpznglAqyVo : dpznglAqyVos) { dpznglAqyVo.setSfzg(DpEnum.RYZT_LG.getTypeValue()); @@ -155,9 +155,6 @@ public class DpzaglServiceImpl implements DpzaglService { } } - - - } @Override @@ -177,18 +174,18 @@ public class DpzaglServiceImpl implements DpzaglService { // 安全 巡检工单，整改情况 HseSafetyInspectionQueryReq req = new HseSafetyInspectionQueryReq(); // 质量展示数据 - TableDataInfo anList = safetyInspectionService.queryPageList(req, pageQuery); +// TableDataInfo anList = safetyInspectionService.queryPageList(req, pageQuery); // 质量展示数据-整改 req.setStatus(DpEnum.ZLGDZT_ZG.getTypeValue()); TableDataInfo aqZgList = safetyInspectionService.queryPageList(req, pageQuery); // 质量总数（用于判断巡检类型） - List list = safetyInspectionService.list(); + List list = safetyInspectionService.list(new LambdaQueryWrapper().ge(bo.getStartDate() != null ,HseSafetyInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,HseSafetyInspection::getCreateTime, bo.getEndDate())); - List rows = anList.getRows(); +// List rows = anList.getRows(); - if (rows != null && rows.size() > 0){ - dpznglVo.setAqZS(anList.getTotal()); - dpznglVo.setAqList(rows); + if (list != null && list.size() > 0){ + dpznglVo.setAqZS(Long.valueOf(list.size())); + dpznglVo.setAqList(MapstructUtils.convert(list, HseSafetyInspectionVo.class)); dpznglVo.setZxjcAq(list.stream().filter(zl -> DpEnum.ZLGLLX_ZXGL.getTypeValue().equals(zl.getCheckType())).count()); dpznglVo.setDqjcAq(list.stream().filter(zl -> DpEnum.ZLGLLX_DQJC.getTypeValue().equals(zl.getCheckType())).count()); dpznglVo.setRcxjAq(list.stream().filter(zl -> DpEnum.ZLGLLX_RCXJ.getTypeValue().equals(zl.getCheckType())).count()); @@ -211,10 +208,10 @@ public class DpzaglServiceImpl implements DpzaglService { // 质量展示数据-整改 req.setInspectionStatus(DpEnum.ZLGDZT_ZG.getTypeValue()); TableDataInfo zlZgLists = qualityInspectionService.queryPageList(req, pageQuery); -// 质量总数（用于判断巡检类型） +// 质量总数 List zsZl = qualityInspectionService.getBaseMapper() .selectList(new LambdaQueryWrapper() - .eq(QltQualityInspection::getInspectionType,DpEnum.ZLGDZT_ZG.getTypeValue())); + .ge(bo.getStartDate() != null ,QltQualityInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,QltQualityInspection::getCreateTime, bo.getEndDate())); // List rows = zlLists.getRows(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java index aed02b38..bb686633 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java @@ -157,14 +157,14 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus SELECT a.user_id , a.loc_latitude, a.loc_longitude" + - "FROM (\n" + + @Select("") + " GROUP BY a.user_id ") List listByAqy(@Param("collect") List collect, @Param("projectId") Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java index 39b539fb..0bb1123e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/BigScreenWebSocketServer.java @@ -4,9 +4,9 @@ import cn.hutool.json.JSONUtil; import jakarta.websocket.*; import jakarta.websocket.server.ServerEndpoint; import lombok.extern.slf4j.Slf4j; -import org.dromara.bigscreen.domain.vo.InventoryStructureAnalysisVo; -import org.dromara.bigscreen.domain.vo.designAndArrivalComparisonVo; -import org.dromara.bigscreen.domain.vo.wzxqysjdhdbVo; +import org.dromara.bigscreen.domain.bo.DpznglBo; +import org.dromara.bigscreen.domain.vo.*; +import org.dromara.bigscreen.service.DpzaglService; import org.dromara.bigscreen.service.IMaterialsManagementService; import org.dromara.cailiaoshebei.domain.vo.BusPurchaseDocVo; import org.dromara.cailiaoshebei.service.IBusMrpBaseService; @@ -15,6 +15,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.materials.domain.vo.materials.MatMaterialsUseDetailVo; import org.dromara.materials.service.IMatMaterialsService; import org.dromara.project.service.impl.BusAttendanceServiceImpl; +import org.dromara.system.service.impl.SysUserServiceImpl; import org.springframework.stereotype.Component; import java.io.IOException; @@ -87,6 +88,8 @@ public class BigScreenWebSocketServer { IBusMrpBaseService mrpBaseService = SpringUtils.getBean(IBusMrpBaseService.class); IMatMaterialsService materialsService = SpringUtils.getBean(IMatMaterialsService.class); BusAttendanceServiceImpl busAttendanceService = SpringUtils.getBean(BusAttendanceServiceImpl.class); +// 大屏-质安管理 + DpzaglService dpzaglService = SpringUtils.getBean(DpzaglService.class); Long projectId = Long.parseLong(split[0]); long type = Long.parseLong(split[1]); @@ -107,6 +110,9 @@ public class BigScreenWebSocketServer { maps.add(infoData); break; case 3: + if (dpzaglService != null){ + saveDateDpzagl(dpzaglService,params,projectId,maps); + } break; case 4: break; @@ -304,4 +310,41 @@ public class BigScreenWebSocketServer { public static int getOnlineCount() { return ONLINE_SESSIONS.size(); } + + + private void saveDateDpzagl(DpzaglService dpzaglService, Map> params,Long projectId,List> maps) { + DpznglBo dpznglBo = new DpznglBo(); + dpznglBo.setProjectId(projectId); + // 查询大屏-质安管理-安全员分布情况 + + List dpznglAqyVos = dpzaglService.listByAqy(dpznglBo); + if (dpznglAqyVos != null && dpznglAqyVos.size() > 0){ + Map map = new HashMap<>(); + map.put("type","aqy"); + map.put("data", JSONUtil.toJsonStr(dpznglAqyVos)); + maps.add(map); + } + // 查询大屏-质安管理-站班会，巡检工单，整改情况 + DpznglVo dpznglVo = dpzaglService.queryList(dpznglBo); + + if (dpznglVo != null){ + Map map = new HashMap<>(); + map.put("type","zagl"); + map.put("data", JSONUtil.toJsonStr(dpznglVo)); + maps.add(map); + } + //查询大屏-质安管理-站班会 + DpznglVo byzbh = dpzaglService.listByzbh(dpznglBo); + if (byzbh != null){ + Map map = new HashMap<>(); + map.put("type","zbh"); + map.put("data", JSONUtil.toJsonStr(byzbh)); + maps.add(map); + } + + } + + + + }