质安管理

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;
 
     /**

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<HseSafetyInspectionVo> anList = safetyInspectionService.queryPageList(req, pageQuery);
+//        TableDataInfo<HseSafetyInspectionVo> anList = safetyInspectionService.queryPageList(req, pageQuery);
 //        质量展示数据-整改
         req.setStatus(DpEnum.ZLGDZT_ZG.getTypeValue());
         TableDataInfo<HseSafetyInspectionVo> aqZgList = safetyInspectionService.queryPageList(req, pageQuery);
 //        质量总数（用于判断巡检类型）
-        List<HseSafetyInspection> list = safetyInspectionService.list();
+        List<HseSafetyInspection> list = safetyInspectionService.list(new LambdaQueryWrapper<HseSafetyInspection>().ge(bo.getStartDate() != null ,HseSafetyInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,HseSafetyInspection::getCreateTime, bo.getEndDate()));
 
-        List<HseSafetyInspectionVo> rows = anList.getRows();
+//        List<HseSafetyInspectionVo> rows = anList.getRows();
 
-        if (rows != null && rows.size() > 0){
+        if (list != null && list.size() > 0){
-            dpznglVo.setAqZS(anList.getTotal());
+            dpznglVo.setAqZS(Long.valueOf(list.size()));
-            dpznglVo.setAqList(rows);
+            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<QltQualityInspectionVo> zlZgLists = qualityInspectionService.queryPageList(req, pageQuery);
-//        质量总数（用于判断巡检类型）
+//        质量总数
         List<QltQualityInspection> zsZl = qualityInspectionService.getBaseMapper()
             .selectList(new LambdaQueryWrapper<QltQualityInspection>()
-                .eq(QltQualityInspection::getInspectionType,DpEnum.ZLGDZT_ZG.getTypeValue()));
+                .ge(bo.getStartDate() != null ,QltQualityInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,QltQualityInspection::getCreateTime, bo.getEndDate()));
 
 
 //        List<QltQualityInspectionVo> rows = zlLists.getRows();

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java

@@ -162,9 +162,9 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus<GpsEquipmentSon, G
         "    SELECT user_id , loc_latitude,loc_longitude, ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY create_time DESC) AS rn\n" +
         "    FROM gps_equipment_son\n" +
         ")  a  , bus_user_project_relevancy as b  WHERE a.user_id = b.user_id and  b.project_id = #{projectId} " +
-        " rn = 1  and user_id IN (<foreach collection=\"collect\" item=\"id\" separator=\",\" open=\"(\" close=\")\">\n" +
+        "  and rn = 1  and a.user_id IN  <foreach collection=\"collect\" item=\"id\" separator=\",\" open=\"(\" close=\")\">\n" +
         "                #{id}\n" +
         "            </foreach>\n" +
-        "        )  GROUP BY a.user_id </script>")
+        "          GROUP BY a.user_id </script>")
     List<GpsEquipmentSon> listByAqy(@Param("collect") List<Long> collect, @Param("projectId") Long projectId);
 }

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.bo.DpznglBo;
-import org.dromara.bigscreen.domain.vo.designAndArrivalComparisonVo;
+import org.dromara.bigscreen.domain.vo.*;
-import org.dromara.bigscreen.domain.vo.wzxqysjdhdbVo;
+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<String, List<String>> params,Long projectId,List<Map<String, String>> maps) {
+        DpznglBo dpznglBo = new DpznglBo();
+        dpznglBo.setProjectId(projectId);
+        //  查询大屏-质安管理-安全员分布情况
+
+        List<DpznglAqyVo> dpznglAqyVos = dpzaglService.listByAqy(dpznglBo);
+        if (dpznglAqyVos != null && dpznglAqyVos.size() > 0){
+            Map<String, String> 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<String, String> 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<String, String> map = new HashMap<>();
+            map.put("type","zbh");
+            map.put("data", JSONUtil.toJsonStr(byzbh));
+            maps.add(map);
+        }
+
+    }
+
+
+
+
 }